Merge branch 'hotfix/1.2.4' v1.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 17:32:07 +0000 (13:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 17:32:07 +0000 (13:32 -0400)
commitffba007f5b7154b9cc1afc11c812a49e188ab07f
tree8223dcb5aa54a2156a79133b4fa6464a4239772d
parenta793e72ef66f4da3059a32600df7519288207104
parentee4ff11f23189dad85a4106650b057875b14c0da
Merge branch 'hotfix/1.2.4'