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

Merge branch 'hotfix/1.0.7'
---

8bccdc18d4a1386e799cd98a2b907dd9f9bf6507