Merge branch 'hotfix/1.2.28' v1.2.28
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Aug 2016 18:51:14 +0000 (14:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Aug 2016 18:51:14 +0000 (14:51 -0400)
commitdbda11e42982215bb63fe3c25f026e69d8296b3b
tree35c9e64c40565d03ef14baf6146821bbe39b6fc1
parentd0693e847dbf7d6f7efbf9e9ada73540edfed6cb
parentb68c09057412a6f56a95fb993bb70f179096467f
Merge branch 'hotfix/1.2.28'