From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 30 Jun 2014 15:38:06 +0000 (-0400)
Subject: Merge branch 'release/1.0'
X-Git-Tag: v1.0^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=af6a5fd3088285f031012f2494dc4f01e3fcf319;p=web%2FCedarvilleMarine.git

Merge branch 'release/1.0'
---

af6a5fd3088285f031012f2494dc4f01e3fcf319