Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 17:37:01 +0000 (13:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 17:37:01 +0000 (13:37 -0400)

Trivial merge