From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 5 Mar 2015 21:55:32 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=cc39e267e94c74af7efe7b016a31f74bd4730dac;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.0.2'
---

cc50f1c046df91f3343fa810d6ac43aff364e57a