From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 3 Mar 2015 16:57:26 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.2'
X-Git-Tag: v1.2.1~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=555cf7e93e2fac194e7147d63c283a287ed93d19;p=web%2FMichiganTrailMaps.git

Merge branch 'hotfix/1.2.2'
---

555cf7e93e2fac194e7147d63c283a287ed93d19