From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 22 Apr 2015 12:48:55 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.39'
X-Git-Tag: v1.2.39
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=981b2b5d44130079652f3c3ac036e828a5c3c73d;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.2.39'
---

4de852b1a02507b31e745e2536bb35ac2fa5dcfd