From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 10 Mar 2015 18:43:01 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.1'
X-Git-Tag: v1.1.1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=ea3f96cee7f294b636f2e11b1d73828c70e9a1aa;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.1.1'
---

7900d1277cad06311f98c835e64f8fe5e65ade70