From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 16 Jan 2015 16:42:20 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.33' into develop
X-Git-Tag: v1.2.38^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5301cde48c9e632385d4d1364e44c2a317b44b76;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.2.33' into develop
---

5301cde48c9e632385d4d1364e44c2a317b44b76