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

Merge branch 'hotfix/1.1.3'
---

18c01e796db1f4de9ebb5da2f85e8c61a90145de