From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 29 Sep 2016 18:36:01 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.10'
X-Git-Tag: v1.2.10
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f4e2564600d43ed9e482d224c6a9eebf5d297fbb;p=web%2FMichiganTrailMaps.git

Merge branch 'hotfix/1.2.10'
---

0e60d72b0e1f08286b67550418c51b94ab99d9c6