Merge branch 'hotfix/1.0.12' v1.0.12
authorIan Weller <ian@gaslightmedia.com>
Tue, 5 Jul 2016 19:58:57 +0000 (15:58 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 5 Jul 2016 19:58:57 +0000 (15:58 -0400)
commit50ee6232ef1a0f19c05091c7b8f8fd935d40ffa7
tree98e77c7d7d9a286d5e5dd86efea5ff5a675dcc09
parent07b9f666e1771d20b341affcb8d1bc3c882dd1ce
parentaa935cc8c41caf0b68a6aa7d8d69293bed9282cc
Merge branch 'hotfix/1.0.12'