Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Nov 2015 18:33:13 +0000 (13:33 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Nov 2015 18:33:13 +0000 (13:33 -0500)
commitb7962b2c8db3d4dee607e469d39bb77b6a801eaa
tree93373d3b86874bc9e0a218abecdcedc4b9fa7b82
parent5c28b84cd0071b43f15a2c824988e4fcab6f1ec8
parent9116e2cdc7506aca88d12a7665b46a718cf01b81
Merge branch 'hotfix/1.0.1'