Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Aug 2015 21:02:37 +0000 (17:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Aug 2015 21:02:37 +0000 (17:02 -0400)
commit9e21da39f946a5bb5b5b9ff9a11ccd774666391a
tree2c85c565ce8e75a3cb65d5182253da2da89fdc6a
parent5c93519046fc491bb8942beb33e0efa446f86016
parent8d806b050116dea160108a69aaa22242907272ad
Merge branch 'hotfix/1.0.6'