Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 18:36:04 +0000 (14:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 18:36:04 +0000 (14:36 -0400)
commit71adedfcda46541ef65bd8be4685f219f0f9b205
treeb69616691b11e4dbd782bb76401ac2afd238767f
parentccdf6fce65562c2bfb204637ad344469ec0cc873
parent34f1db11440c8247106145502f8f87a79987aa46
Merge tag 'v1.0.2' into develop

v1.0.2