Merge branch 'hotfix/1.2.2' v1.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 19:57:26 +0000 (15:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 19:57:26 +0000 (15:57 -0400)
commit13f2c447f281d11c156be8486a6ebdcc36bb4aa0
tree45b052b74c9ec02485baf9ca25a3c045c7d9fc8c
parent27a25954533fbfafeda0376cae1d14757f85101f
parentf7886630bdbe75bdf2bfc9ec827128623ef7900e
Merge branch 'hotfix/1.2.2'