From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 9 Dec 2015 15:02:35 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.11' into develop
X-Git-Tag: v1.2^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c7530175d9d219a964ee6941e77c67b816681fde;p=web%2FCityofMI.git

Merge branch 'hotfix/1.1.11' into develop
---

c7530175d9d219a964ee6941e77c67b816681fde