From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 15 Aug 2014 14:06:35 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.5'
X-Git-Tag: v1.1.5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=bfc9689e6750ce1667738788040538a7fb60c25a;p=web%2FCityofMI.git

Merge branch 'hotfix/1.1.5'
---

22771f72b598636842231876bc9f4fd2619aa99b