From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 10 Mar 2015 20:40:49 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.5'
X-Git-Tag: v1.1.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8aa5fd172c6653f7441beff4aa52cccc8d755834;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.1.5'
---

8aa5fd172c6653f7441beff4aa52cccc8d755834