Merge branch 'release/1.0.0' v1.0.0
authorLaury GvR <laury@gaslightmedia.com>
Thu, 25 Jun 2015 16:36:48 +0000 (12:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 25 Jun 2015 16:36:48 +0000 (12:36 -0400)

Trivial merge