Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Apr 2015 14:55:48 +0000 (10:55 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Apr 2015 14:55:48 +0000 (10:55 -0400)
commit4c86e710d759d37be29c8fdbb111c8334192e0a2
tree63252789605b63b579f369ee2faee6b64613a475
parent26779883c1bbfd8ff6583c0072594a328436064b
parent6b7f88db2fcbf04b5f17d12df31f9670dc8067e8
Merge branch 'hotfix/1.0.4'