From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 13 Mar 2015 16:48:47 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.20'
X-Git-Tag: v1.0.20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=c8171b7902ca483a18fb6571b907f77aab998349;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.0.20'
---

75e88d10533ecc9216ccc95d7ff0e646582f5f2a