From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 25 Sep 2014 18:53:32 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.31'
X-Git-Tag: v1.1.31^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=84f3b721aee72b83a75e2a4b7f3b3c0a691f3927;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.1.31'
---

84f3b721aee72b83a75e2a4b7f3b3c0a691f3927