Merge branch 'hotfix/1.2.37' v1.2.37
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Apr 2015 12:53:06 +0000 (08:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Apr 2015 12:53:06 +0000 (08:53 -0400)
commit2623617ea7ae78641bdfc30fc62b4682d4ad2463
treeb27af6fe88884c53bea6f3b86e3aa004fd79d842
parent1ece094a2ede5fea4939e16d1f1deea77192645e
parent964b45a5c40eda3d1e4f38105ca4016822cf157a
Merge branch 'hotfix/1.2.37'