From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Aug 2014 18:06:12 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.11'
X-Git-Tag: v1.0.11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=7275260a0c9ca1fddf9a17637fb03bfea0891f0b;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.11'
---

1db5ce4dfa4da616739de2422f522a4d78c4cb0a