Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:06:09 +0000 (11:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:06:09 +0000 (11:06 -0400)
commit5406730843533c53480133bdc29fa9fd4579b792
tree2ba9c363a3b07fbff83341f9a60999682a4359f3
parent06537b3e5e1205e9f875bd27e5888150d56e6b43
parent279597d7639ae3cf5ba6bd5e0ca4e7c7cb1ebc53
Merge branch 'hotfix/1.0.5'