From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 20 Mar 2015 14:13:26 +0000 (-0400)
Subject: Merge branch 'release/1.2.0'
X-Git-Tag: v1.2.0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=36a58e25768d56904cde943d848212dd6ada2458;p=web%2FGaylordGolfMecca.git

Merge branch 'release/1.2.0'
---

e71d8992eed2837ed22c53e36281cecbed8815ee