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

Merge branch 'hotfix/1.2.3'
---

2aeb42cfc1000b8c33b0d17ca68a86edc8a74f4f