From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 6 Mar 2015 20:06:03 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.35'
X-Git-Tag: v1.2.35^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=da8c974279fe2a4dc50942d03dffb9a9d7e86336;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.2.35'
---

da8c974279fe2a4dc50942d03dffb9a9d7e86336