Merge tag 'v1.0.25' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 12:53:35 +0000 (08:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Aug 2014 12:53:35 +0000 (08:53 -0400)
Version 1.0.25


Trivial merge