From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 16 Jan 2015 16:41:56 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.33'
X-Git-Tag: v1.2.33
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=a6add402b0542216c40b841b79b7e5800e01c521;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.2.33'
---

810a81607326914cc720faf56f77a92a87d71ea4