From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 8 Dec 2014 17:41:20 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.33'
X-Git-Tag: v1.2.33~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=81284039c459ceb3d744cd461415cd8545a67070;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.2.33'
---

81284039c459ceb3d744cd461415cd8545a67070