Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 10 Jun 2016 20:56:23 +0000 (16:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 10 Jun 2016 20:56:23 +0000 (16:56 -0400)
commit3315d8da23a8f29c7daca71ceedced3f957b7774
tree9d8e3f31e3e5a2d28da5411503ca37af2d2bd52d
parente03a4cb701b57f4840f3e4cc7cd53067b77548cc
parent5b2165abaff89e836cda6dfdcd18b0e3d6c803b8
Merge branch 'hotfix/1.0.4'