From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 24 May 2016 14:50:22 +0000 (-0400)
Subject: Merge branch 'hotfix/1.5.1'
X-Git-Tag: v1.5.1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=99198558633ad6cf12017a0c211fe4f98a58643c;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.5.1'
---

2bb26804120bedde13af9564cdca5e221b4aac31