From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 22 Aug 2014 13:51:58 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.26'
X-Git-Tag: v1.0.26^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=abfebf60aab7bb00fd5524c97f21a1d2402114ca;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.26'
---

abfebf60aab7bb00fd5524c97f21a1d2402114ca