From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 20 Mar 2015 18:50:14 +0000 (-0400)
Subject: Merge branch 'release/1.2.5'
X-Git-Tag: v1.2.5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ac338ee3d2f2e77b3e05b2a006d04cade429ed08;p=web%2FGaylordGolfMecca.git

Merge branch 'release/1.2.5'
---

4224b153b7b697c13fe992f6dd3ca14e09d24fb9