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

Merge branch 'hotfix/1.1.4'
---

92c81aa58c5ad9bf2a34bdda346294fcb9e9d4d3