Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 10 Jun 2016 20:56:39 +0000 (16:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 10 Jun 2016 20:56:39 +0000 (16:56 -0400)
commita215ff0f3899fddf8b76d8f9a0bfb05584a115c4
tree9d8e3f31e3e5a2d28da5411503ca37af2d2bd52d
parent7de12e4cb639ab11885658e2fbc6a481281d5b7d
parent3315d8da23a8f29c7daca71ceedced3f957b7774
Merge tag 'v1.0.4' into develop

version 1.0.4