Merge branch 'hotfix/1.0.12' v1.0.12
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 16:43:19 +0000 (12:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 16:43:19 +0000 (12:43 -0400)
commit1818d63ae3e6beeea996d0fdff38f7865b8f481b
treef1e0591b19150d083ab16d83e94703fd556b3dc7
parent591919c3a56b00d777945c45916d5988193d86c7
parentfd18d8d11d5d799cc6fcf0a42e695f0c805f0a38
Merge branch 'hotfix/1.0.12'