From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 9 Oct 2014 14:47:17 +0000 (-0400)
Subject: Merge branch 'release/1.2'
X-Git-Tag: v1.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=480b2835ff4f81084709e627dce517b275f875d2;p=web%2FMichiganTrailMaps.git

Merge branch 'release/1.2'
---

50e525efe57c637f64b19181b0f6bf1ffe16dd1b