Merge branch 'hotfix/1.5.2' v1.5.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:50:14 +0000 (14:50 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:50:14 +0000 (14:50 -0400)
commitbe01d697ebae035d8fa1db64bf048001be39a5c5
tree3acd42cb70d7f1070d3c61baeb6bb29f9e9fb8ae
parent2bb26804120bedde13af9564cdca5e221b4aac31
parent92430fd1db62a20e51c9a00a93539f4f72d61322
Merge branch 'hotfix/1.5.2'