From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 29 Apr 2016 20:55:07 +0000 (-0400)
Subject: Merge tag 'v1.2.6' into develop
X-Git-Tag: v1.2.11^2~5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=ac37709b68258b61fc7aefd13507edbc15947c27;p=web%2FMichiganTrailMaps.git

Merge tag 'v1.2.6' into develop

Version 1.2.6
---

ac37709b68258b61fc7aefd13507edbc15947c27