From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 14 Jul 2015 13:56:44 +0000 (-0400)
Subject: Merge branch 'hotfix/1.3.5'
X-Git-Tag: v1.3.6~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=59d5594b87316e87f30de0f93be7ac383c42f1e5;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.5'
---

59d5594b87316e87f30de0f93be7ac383c42f1e5