From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Aug 2014 18:20:58 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.13'
X-Git-Tag: v1.0.13^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=a189ee192866fcb33a2e0bab4276e015f7b8bfa1;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.13'
---

a189ee192866fcb33a2e0bab4276e015f7b8bfa1