From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 5 Mar 2015 22:19:14 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.5'
X-Git-Tag: v1.0.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=1db42898abe3667776d7d0af30026210d49dd128;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.0.5'
---

1db42898abe3667776d7d0af30026210d49dd128