From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 21 Aug 2014 19:23:23 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.24' into develop
X-Git-Tag: v1.1.30^2~8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=eb9cf1f9028a21710d9e95ec576220c4a8e2dcf0;p=web%2FKeweenaw.git

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

eb9cf1f9028a21710d9e95ec576220c4a8e2dcf0