From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 21 Aug 2014 19:22:54 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.24'
X-Git-Tag: v1.0.24^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=42d8c6e4023199ebbcc6e00f34a3f14ff987b6e4;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.24'
---

42d8c6e4023199ebbcc6e00f34a3f14ff987b6e4