Merge branch 'hotfix/1.2.15' v1.2.15
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 15:39:54 +0000 (10:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 15:39:54 +0000 (10:39 -0500)
commit7ef7a4ee01925dcfec7d7e1a787f9d39f4876131
tree4e51da8469df5cd2fec515dd87f15f805ae7991c
parent1c624cec62d694c13173003886edcad6a04743d9
parentf6be4d96c06f957080167efb8c2efb63f65c55da
Merge branch 'hotfix/1.2.15'