Merge branch 'hotfix/1.0.30' v/1.0.30
authorIan Weller <ian@gaslightmedia.com>
Tue, 11 Oct 2016 16:06:17 +0000 (12:06 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 11 Oct 2016 16:06:17 +0000 (12:06 -0400)
commit864dedded72cc1bdc3e5d83a9d004f7c9e4f9dcc
tree802f55b29f9b2d06bf51b64441c22850437b7ba4
parent7f7130ada5bfa3f52134bee27de5ec8ed23fee80
parentbab5dd201346b40ea6744b27d5a09a1c077f5cf8
Merge branch 'hotfix/1.0.30'