Merge branch 'hotfix/1.2.36' v1.2.36
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Apr 2015 12:46:30 +0000 (08:46 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Apr 2015 12:46:30 +0000 (08:46 -0400)
commit1ece094a2ede5fea4939e16d1f1deea77192645e
tree98769769c2a804a8b4fa090db077a046ff11ba47
parentda8c974279fe2a4dc50942d03dffb9a9d7e86336
parente2c404ff69ecb20d5f61b7f6d70eb78e0c6c661d
Merge branch 'hotfix/1.2.36'