From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 1 Jun 2015 18:56:38 +0000 (-0400)
Subject: Merge branch 'hotfix/1.4.2'
X-Git-Tag: v1.4.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2818ad8ca87d21133fd61fdaf544468e3e1aba62;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.4.2'
---

c31b8fbbd64b9290df30d6300ce89277dc5c37c2