From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 30 Dec 2014 16:34:02 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.8'
X-Git-Tag: v1.1.8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c5609156421e54bc8e8306287c8338668ae461bd;p=web%2FCityofMI.git

Merge branch 'hotfix/1.1.8'
---

1f599b9fb0ac7a20436efc1145f2918bd8825398