From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 29 Apr 2015 13:44:22 +0000 (-0400)
Subject: Merge tag 'v1.2.40' into develop
X-Git-Tag: v1.3.0^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=aa08ccf2c32d152a36c018ea46f2c50409755e65;p=web%2FKeweenaw.git

Merge tag 'v1.2.40' into develop

Version 1.2.40
---

aa08ccf2c32d152a36c018ea46f2c50409755e65