From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 13 Apr 2016 18:06:56 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.12'
X-Git-Tag: v1.1.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7efbc77bff2036b0c6814134e1423e63754cb7a8;p=web%2FCityofMI.git

Merge branch 'hotfix/1.1.12'
---

5f6be60b01c490061aea5b1e96994ea7ea61eb04