From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 20 Mar 2015 18:39:53 +0000 (-0400)
Subject: Merge branch 'release/1.2.4'
X-Git-Tag: v1.2.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=9941477292d6c62197870050f67d93b32f656424;p=web%2FGaylordGolfMecca.git

Merge branch 'release/1.2.4'
---

ca9e3c5ae205d77e810b4d9aaeff7db5273b6478