Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Nov 2016 15:24:25 +0000 (10:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Nov 2016 15:24:25 +0000 (10:24 -0500)
commit9553c8de73daf312bb27f46da16531f0bcc91b09
treec005d5c27b747e970228c0d79cae363193bef913
parentf88ce1a8a6639a7c2b8e418f7b390b9843d9932e
parent7ac7a22b474a2e4981b1d5d5559442a12e8eecbe
Merge branch 'hotfix/1.0.2'