Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 21:55:32 +0000 (16:55 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 21:55:32 +0000 (16:55 -0500)
commitcc50f1c046df91f3343fa810d6ac43aff364e57a
tree9db78d7258d753f880394c21a0c418c8e38231c2
parent10ba93d00691961c9fbe35df6ccf7901ec2c540a
parentfb619539b1b5dc81c719bc544ec417a854c55251
Merge branch 'hotfix/1.0.2'