Merge branch 'hotfix/1.2.27' v1.2.27
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Jun 2016 15:53:39 +0000 (11:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Jun 2016 15:53:39 +0000 (11:53 -0400)
commit4839beb42fba91d97b6df5de20782b38326abaa3
treed9fd0c758b6b4828ab5a3cc91bd0f7f077c2cf6a
parent33e67fc3addcd5e8badda1d365ddb8660bc5e590
parent37837c681610e90a32efed18dd33689058b9935a
Merge branch 'hotfix/1.2.27'