Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 19:15:38 +0000 (15:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 19:15:38 +0000 (15:15 -0400)
commitba14f320b9f9130232bccc21664b73e3867e8fd9
tree4f5a1d211b67d412ad7c1a77aa7a4db0f404bbb5
parente50f8bcc4ac3b61615f11d91b424fd83fbdd3b04
parent1314017b8749475a176c84bfb120b423196fd5dd
Merge branch 'hotfix/1.0.18'