Merge branch 'hotfix/1.5.2' v1.5.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 17:31:32 +0000 (12:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 17:31:32 +0000 (12:31 -0500)
commitcbdb06de95c811ec52eb059dfd7c3dec8f491bbb
tree2810c1e779c2fa8cc89a4cc59bc8beaf78b1a322
parenta8bbafb20ec10467acbfa4c6fd1bb5c446c1d151
parentd687c36d314c7365b38e4f30748b57197e1a8e82
Merge branch 'hotfix/1.5.2'