From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 5 Mar 2015 22:14:10 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=63037e6868a058f671677ef992398be3a4cae65e;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.0.4'
---

3707972d0307f7765b520d5b055ad2f41fbf616f