Merge branch 'release/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:03:13 +0000 (11:03 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:03:13 +0000 (11:03 -0400)
commit06537b3e5e1205e9f875bd27e5888150d56e6b43
tree4f2c21c2bebee84c87b866957f36699f22ab13ad
parent609eb4ba0a6c4fb342fb23da15c5ae881c759830
parent5699c91261546db4ed72a3f1374c10c1dd71c274
Merge branch 'release/1.0.4'