Merge branch 'hotfix/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 May 2016 17:43:15 +0000 (13:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 May 2016 17:43:15 +0000 (13:43 -0400)
commit0830f9a9f8e170dc2c7389c4652c9943bd688dc8
tree440b4d77438a025c5ef8020bf302a5b9839e3478
parent9faeaa11946a4c06f7f8b573a16b8c148db3dcf6
parent15c4fac8b98cbf5e1af1c17143ea2551a856a2c6
Merge branch 'hotfix/1.0.29'