Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:25:56 +0000 (14:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:25:56 +0000 (14:25 -0500)
commit4f1eb59387bfda885b6b976554ee4c6c7ad424f3
treedc2a3812a1a127712c2277fce1dd0aca7e45c453
parentaa4ebb769996b7933a5ac461f4cbbd62b039e3d4
parent31a5d2c0d4879e2ff0e0b82859e2dfb78c9a02fb
Merge branch 'hotfix/1.0.5'