Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:35:48 +0000 (14:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:35:48 +0000 (14:35 -0500)
commit6aaa8d692eafc9526fef3f5ac442f752fefd4e31
treef4f28ef6a0a81854f13be70f3a961e2c040548af
parent598ab970e1a1734cc2a175f4bd2783ff310e6a3e
parentf8f12349e5593417f448b8e29e846818d41fee93
Merge branch 'hotfix/1.0.2'