Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 19:30:19 +0000 (15:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 19:30:19 +0000 (15:30 -0400)

Trivial merge