From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 17 Mar 2015 17:07:51 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.1'
X-Git-Tag: v1.2.1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=b28f54d9eb2b64a1fa668b2c5b20621a2989879a;p=web%2FMichiganTrailMaps.git

Merge branch 'hotfix/1.2.1'
---

e0563940117cf1ad0c6604c7a5e560080dac8d97