Merge branch 'release/0.2.5' v0.2.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 3 Dec 2015 14:35:41 +0000 (09:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 3 Dec 2015 14:35:41 +0000 (09:35 -0500)

Trivial merge