From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 9 Mar 2015 14:24:16 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.12'
X-Git-Tag: v1.0.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=7ce3314a8a7555307df98d258dcf4f857f6764a2;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.0.12'
---

c89fe0da859235597e06808e3b5ae68f6bb83d0b