From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 25 Jul 2014 14:38:18 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:web/CityofMI into develop
X-Git-Tag: VV1^2~70
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=988efb8b14ff863cebc96373fab196b523cf1a63;p=web%2FCityofMI.git

Merge branch 'develop' of cvs2:web/CityofMI into develop
---

988efb8b14ff863cebc96373fab196b523cf1a63