From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 10 Mar 2015 16:07:20 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.18'
X-Git-Tag: v1.0.18^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6ecd5d67238d7f0a84e1ecbcd929e667840767c9;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.0.18'
---

6ecd5d67238d7f0a84e1ecbcd929e667840767c9