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
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=7d0fefcb71ef2c859283e856179fa4aa6c4fe8c0;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.30'
---

8b48661297d12419c27d0f2bfe951ea7384fba98