From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Aug 2014 20:41:58 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.18'
X-Git-Tag: v1.0.18^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5a8e9f93e4291b0a47ee9c85f3ec675fa339fd58;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.18'
---

5a8e9f93e4291b0a47ee9c85f3ec675fa339fd58