From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 18 Mar 2015 20:11:26 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.3'
X-Git-Tag: v1.2.3^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=aed1249d9921465e41c5737c0d54c2042a9a036a;p=web%2FMichiganTrailMaps.git

Merge branch 'hotfix/1.2.3'
---

aed1249d9921465e41c5737c0d54c2042a9a036a