Merge branch 'hotfix/1.0.12' v1.0.12
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 30 Jul 2015 20:17:20 +0000 (16:17 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 30 Jul 2015 20:17:20 +0000 (16:17 -0400)
commitd26aca9c9904a0d2cbc75658f9aca78e367ec33c
treec018689325df6e966983d2582bfeaa0e7edd2b77
parent8e13b4eb31b6a206b26870a3e26739c42cb0cb17
parentab49c4177d0d2b00ddd2bd204e61a84b721c30ad
Merge branch 'hotfix/1.0.12'