Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 May 2016 17:49:06 +0000 (13:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 May 2016 17:49:06 +0000 (13:49 -0400)

Trivial merge