Merge branch 'release/0.2.1' v0.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Dec 2015 21:07:49 +0000 (16:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Dec 2015 21:07:49 +0000 (16:07 -0500)

Trivial merge