Merge branch 'hotfix/1.2.30' v1.2.30
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:01:38 +0000 (12:01 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:01:38 +0000 (12:01 -0400)
commit0d148117b4d5010b5a2da81c000f0f5524151dc3
tree6ede1069350bda39b14a20d274e3d75f55fd73b9
parent725c4b33da38a0ccec7cad5de608ce20caccd0d0
parent387a6f727c8c72bd18ccf357f1bd8f81ec4f5db1
Merge branch 'hotfix/1.2.30'