From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 3 Mar 2015 14:45:49 +0000 (-0500)
Subject: Merge branch 'hotfix/ShopHeading'
X-Git-Tag: v1.2.1~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ca856e3b8c1050f0aa5039476c3607e0677080c4;p=web%2FMichiganTrailMaps.git

Merge branch 'hotfix/ShopHeading'
---

ca856e3b8c1050f0aa5039476c3607e0677080c4