Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 13:57:56 +0000 (09:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 13:57:56 +0000 (09:57 -0400)
commit5d4b85bde876d7c5a296e1e962efd84ce290ce10
tree055760cb1c9704cffe502758d8b70e8b32e80523
parent8a9f8ee5e20d1dce590ca1355a78fb5622443443
parent7e0dc2b0a92b05ba3d8c3ea45b879302d954e5a1
Merge branch 'hotfix/1.0.2'