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

Merge branch 'hotfix/1.0.2'
---

6024ee45f64b3fa77f8c462adf2503488f5fa69a