Merge branch 'release/1.0.0'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Jun 2015 14:36:07 +0000 (10:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Jun 2015 14:36:07 +0000 (10:36 -0400)

Trivial merge