Merge branch 'hotfix/1.0.55' v1.0.55
authorLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jan 2016 19:17:35 +0000 (14:17 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 4 Jan 2016 19:17:35 +0000 (14:17 -0500)
commiteecec0e031e835691036a05eea85a6d75c8d53a2
tree9cd9573307dc3c491dee786c00fc8a605ba10d39
parentd165cde31d2ecb3a56fc2e2220f8a373ed7a7378
parent39fef657629e11af87e7941e7ecc6a0e8c96df9b
Merge branch 'hotfix/1.0.55'