Merge branch 'release/1.0' v1.0
authorLaury GvR <laury@gaslightmedia.com>
Wed, 11 Nov 2015 14:15:52 +0000 (09:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 11 Nov 2015 14:15:52 +0000 (09:15 -0500)

Trivial merge