From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Aug 2014 15:28:51 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=8da21c43eabe0235fd2a8a3a4de1ebb0325dc849;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.4'
---

8da21c43eabe0235fd2a8a3a4de1ebb0325dc849