From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 17 Nov 2015 20:06:40 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.4'
X-Git-Tag: v1.2.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9d6c67cd58023830cd604625b39cc0fb6b542e3c;p=web%2FMichiganTrailMaps.git

Merge branch 'hotfix/1.2.4'
---

02861b20bdd1eafc55d18c60ddccd78b0560b2b3