From: Ian Weller <ian@gaslightmedia.com>
Date: Mon, 25 Aug 2014 20:05:34 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.28' into develop
X-Git-Tag: v1.1.30^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4d60e7b1fa128c2b944ed810768b3c69f8428c65;p=web%2FKeweenaw.git

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

4d60e7b1fa128c2b944ed810768b3c69f8428c65