From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 4 May 2017 19:52:42 +0000 (-0400)
Subject: Merge branch 'hotfix/1.5.14'
X-Git-Tag: v1.5.14^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=56a98d1e73c03ad53cf6a6a2c2762526eb7a205a;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.5.14'
---

56a98d1e73c03ad53cf6a6a2c2762526eb7a205a