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

Merge branch 'hotfix/1.0.1'
---

3334ceed7889797af554515541d9bf028efdb520