Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 16:21:55 +0000 (12:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 13 Aug 2015 16:21:55 +0000 (12:21 -0400)
commited886ea94f6487b340110bed4b57c429c8b8a124
treeb700c4faa449f65d64cc7881b6756b8585956e3e
parenta5a4ee40acba3be1eeb8223fbf197402f977034b
parentf4244516b35f43fa60ffa786ef2a23e768ec3410
Merge branch 'hotfix/1.0.2'