From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 29 Aug 2014 13:31:08 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.29'
X-Git-Tag: v1.0.29^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9a4c953c474db32f4975016b41819e30838071bc;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.29'
---

9a4c953c474db32f4975016b41819e30838071bc