From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 22 Aug 2014 12:53:35 +0000 (-0400)
Subject: Merge tag 'v1.0.25' into develop
X-Git-Tag: v1.1.30^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5945dcf6844d11d325397d0354f84e97dd43809e;p=web%2FKeweenaw.git

Merge tag 'v1.0.25' into develop

Version 1.0.25
---

5945dcf6844d11d325397d0354f84e97dd43809e