From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Aug 2014 20:10:40 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.17'
X-Git-Tag: v1.0.17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=1914a018adef9e2fe983bcf21356fec2e00df239;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.17'
---

5a32f8f51f94a128d88019403495eb685993a223