Merge branch 'hotfix/1.0.25' v1.0.25
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 12:53:25 +0000 (08:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 12:53:25 +0000 (08:53 -0400)

Trivial merge