Merge branch 'release/1.0' v1.0
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Sep 2014 15:23:27 +0000 (11:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Sep 2014 15:23:27 +0000 (11:23 -0400)

Trivial merge