Merge branch 'hotfix/1.2.3' v1.2.3
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 20:11:26 +0000 (16:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 20:11:26 +0000 (16:11 -0400)
commitaed1249d9921465e41c5737c0d54c2042a9a036a
treeb2b874b1e0729242a7dce47c8e065abae422f63a
parenteed97e77d170554f1abfd960b91442786a060f85
parent9bb083b686f560500a2b7d59b76f543c6dc9709d
Merge branch 'hotfix/1.2.3'