From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 17 Apr 2015 12:46:30 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.36'
X-Git-Tag: v1.2.36^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1ece094a2ede5fea4939e16d1f1deea77192645e;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.2.36'
---

1ece094a2ede5fea4939e16d1f1deea77192645e