Merge branch 'hotfix/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 14:21:17 +0000 (09:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 14:21:17 +0000 (09:21 -0500)
commitdf5e98c9eeae9ccaa72c315a6c69c062e6c7e80e
treedbddf4149e602a07233396b89d0924bfc3c71faa
parent9d3b78fab17cbf5ed76b68d2512a0676c1f151ef
parent2fc1aaab598cd10b7bf82f8fdcb57cca682c0d70
Merge branch 'hotfix/1.0.29'