From: Ian Weller <ian@gaslightmedia.com>
Date: Mon, 25 Aug 2014 20:05:12 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.28'
X-Git-Tag: v1.0.28^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=03111240d0fc6b0f67b0dcba638672544fea5015;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.28'
---

03111240d0fc6b0f67b0dcba638672544fea5015