Merge branch 'hotfix/1.2.10' v1.2.10
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Jun 2016 18:00:30 +0000 (14:00 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Jun 2016 18:00:30 +0000 (14:00 -0400)
commit9b04c53fdbd7c25eda9a9dab1a0d494427406be6
treeee65ed9feffec728f8e263fc58f7e2716ba6a14a
parente9f49d1ed520fd172b9158d0d0fcce82ece224e2
parenta226515079323ee7fb371b8eb2cffc6ce0be5f69
Merge branch 'hotfix/1.2.10'