From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 21 Aug 2014 20:24:33 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.7' into develop
X-Git-Tag: v1.2^2~7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3941098718684d9924a472f8f41e26c099c13e0d;p=web%2FCityofMI.git

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

3941098718684d9924a472f8f41e26c099c13e0d