Merge branch 'hotfix/1.2.6' v1.2.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Jun 2016 15:17:56 +0000 (11:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Jun 2016 15:17:56 +0000 (11:17 -0400)
commit550e77e2f420c9a6710d55d5a549a53897819672
tree77f603573ef730595ef30e63fc86e5248236a58f
parent3f4d0054f327d930bb637ae676e5513c53776e7b
parentc2a74fb96d28261889f014bd84fe26eced652582
Merge branch 'hotfix/1.2.6'