From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 28 Apr 2016 16:48:44 +0000 (-0400)
Subject: Merge tag 'v1.2.5' into develop
X-Git-Tag: v1.2.11^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=bee24b8c742ef59efcae88347e3301a3c01bde5c;p=web%2FMichiganTrailMaps.git

Merge tag 'v1.2.5' into develop

Version 1.2.5
---

bee24b8c742ef59efcae88347e3301a3c01bde5c