From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 28 Apr 2016 16:48:23 +0000 (-0400)
Subject: Merge branch 'release/1.2.5'
X-Git-Tag: v1.2.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0e9dfede44af8ca65d688c416d0ed138a9abc3ed;p=web%2FMichiganTrailMaps.git

Merge branch 'release/1.2.5'
---

0e9dfede44af8ca65d688c416d0ed138a9abc3ed