From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 22 Aug 2014 12:53:25 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.25'
X-Git-Tag: v1.0.25^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ce8681d30ac7b60456988d9f21542433c24ac800;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.25'
---

ce8681d30ac7b60456988d9f21542433c24ac800