From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Aug 2014 16:03:52 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.6'
X-Git-Tag: v1.0.6^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4a90a9dac809112f0aeca2f6f7162f339c37b88e;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.6'
---

4a90a9dac809112f0aeca2f6f7162f339c37b88e