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
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=efcd9c2cf9c6cd10201f69856937c4fde904069b;p=web%2FCedarvilleMarine.git

Merge branch 'hotfix/1.0.1'
---

5748b6a594e6e2e1eb753170112b42afce73e6da