Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 25 Jun 2015 19:22:29 +0000 (15:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 25 Jun 2015 19:22:29 +0000 (15:22 -0400)
commit0e147de3786012280394aba55f806599c9e9c386
tree3c9f07bb08bafdda5156a97d552f9bf18431cf51
parent696f55995b214d8f9fcb290b1785e72e337a8aec
parent4227aae7ba74dd882e5543a69f3fea373b3a8c41
Merge branch 'hotfix/1.0.2'