Merge branch 'hotfix/1.0.30' v1.0.30
authorIan Weller <ian@gaslightmedia.com>
Tue, 26 Jul 2016 20:54:47 +0000 (16:54 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 26 Jul 2016 20:54:47 +0000 (16:54 -0400)
commit8116b724fad969e5d7692886c222234f1c3b3fa7
tree8be5cdf53ba095357ad287b81aa6df9b52263190
parent0830f9a9f8e170dc2c7389c4652c9943bd688dc8
parent508aebf7a47f843b3af75562732c903cef8a119a
Merge branch 'hotfix/1.0.30'