From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 20 Mar 2015 18:50:23 +0000 (-0400)
Subject: Merge tag 'v1.2.5' into develop
X-Git-Tag: v1.3.0^2~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1e6ca72ffe0feb239ec3e5c384ef7b9958fde14b;p=web%2FGaylordGolfMecca.git

Merge tag 'v1.2.5' into develop

Version 1.2.5
---

1e6ca72ffe0feb239ec3e5c384ef7b9958fde14b