From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 17 Apr 2015 12:53:06 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.37'
X-Git-Tag: v1.2.37^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2623617ea7ae78641bdfc30fc62b4682d4ad2463;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.2.37'
---

2623617ea7ae78641bdfc30fc62b4682d4ad2463