Merge tag 'v1.0.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Oct 2015 13:18:39 +0000 (09:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Oct 2015 13:18:39 +0000 (09:18 -0400)
v1.0.2


Trivial merge