From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 8 Oct 2014 20:06:48 +0000 (-0400)
Subject: Merge branch 'release/1.1'
X-Git-Tag: v1.1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ad94f9572da129b56d72dc6cae6756c734ca9ac8;p=web%2FMichiganTrailMaps.git

Merge branch 'release/1.1'
---

0e24461b2d58f0ff036c70d695945270eb70da65