From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 29 Apr 2015 13:44:12 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.40'
X-Git-Tag: v1.2.40^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e53056cdfe9a8e937100435de685cd889bde0a68;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.2.40'
---

e53056cdfe9a8e937100435de685cd889bde0a68