From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 7 Apr 2017 15:54:29 +0000 (-0400)
Subject: Merge branch 'hotfix/1.5.12'
X-Git-Tag: v1.5.12^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=d529d0389fe1deacb672a9a43bda61cf67974a98;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.5.12'
---

d529d0389fe1deacb672a9a43bda61cf67974a98