From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 2 Sep 2014 16:34:51 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.30'
X-Git-Tag: v1.0.30^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8b48661297d12419c27d0f2bfe951ea7384fba98;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.30'
---

8b48661297d12419c27d0f2bfe951ea7384fba98