Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 15:53:17 +0000 (11:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 15:53:17 +0000 (11:53 -0400)
commitf60252390959580e768c40fdcd77867c518845dd
tree3db531275cd2d79373879e51064a4c515b20f408
parent2bb358407c572ae691d968ca16fad07f5f8dcd69
parentec5b0cf52e42101caa1a34bff35f92c91aa5c2bb
Merge branch 'hotfix/1.0.4'