Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Wed, 27 Jul 2016 18:36:08 +0000 (14:36 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 27 Jul 2016 18:36:08 +0000 (14:36 -0400)
commit8be867a07a0010db8f10f0aeb93cb4cf723e4c20
treec284f23baaedb5e354f2aa7c8e45904beba35718
parent5e30b8c74f4b174db619cc91a9b0832eb744eade
parentf016d07093f3b277ef5e28ba72c15b7c39b302d8
Merge branch 'hotfix/1.0.2'