Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 15:26:52 +0000 (11:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 15:26:52 +0000 (11:26 -0400)
commitae5727e0ee3a676c6212ee48df384f92c87c4c20
treeef325f295c18afc4ea0d92671a8ca8d4422f51ce
parent5a78991dbb8fa362fa34d4aaebce7eb85aee984d
parent0e4755a1e31da7d82450eb6699aa35378f6a338f
Merge branch 'hotfix/1.0.2'