From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Aug 2014 15:46:27 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.5'
X-Git-Tag: v1.0.5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=69233d84fe981f8ff65a16abdf13f35288bcbe4a;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.5'
---

7dc8a0b7325ef1bc57059c850425d4e7a8418928