From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 30 Jun 2014 18:16:35 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.1'
X-Git-Tag: v1.0.1^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5748b6a594e6e2e1eb753170112b42afce73e6da;p=web%2FCedarvilleMarine.git

Merge branch 'hotfix/1.0.1'
---

5748b6a594e6e2e1eb753170112b42afce73e6da