Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:46:37 +0000 (09:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:46:37 +0000 (09:46 -0400)
commita89a0168bb66c7359c77cf3709afeada82bd4be4
treeb7cdf67aa863274b9f1966c19d3c9c2bdfd4b656
parent95c5d2adbf83539cf0e4db54388ffbd647e2ad4e
parent2dff1427569fab18e4d8ce80fca89639bdbc74e5
Merge branch 'hotfix/1.0.2'