From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 3 Sep 2014 16:03:07 +0000 (-0400)
Subject: Merge branch 'release/1.1.30'
X-Git-Tag: v1.1.30
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=cee60ba22b76f4d633552219585999095de5e38a;p=web%2FKeweenaw.git

Merge branch 'release/1.1.30'
---

c27d26ffc1decb996ee88e6fc9d5f8ef3aafad78