Merge branch 'hotfix/1.0.30' v1.0.30
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Sep 2014 16:34:51 +0000 (12:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Sep 2014 16:34:51 +0000 (12:34 -0400)
commit8b48661297d12419c27d0f2bfe951ea7384fba98
tree2630dee87e40c1ac158b3ae6212bd584389567d8
parent9a4c953c474db32f4975016b41819e30838071bc
parentf3d4e8b8eaed5b517f2315ae521b4ad62e435813
Merge branch 'hotfix/1.0.30'