From: Ove Klykken <ove@gaslightmedia.com>
Date: Mon, 21 Jul 2014 13:13:54 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:web/CityofMI into develop
X-Git-Tag: VV1^2~84
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a3c68750822ccd6ab0b0422019cf64a1a018605b;p=web%2FCityofMI.git

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

a3c68750822ccd6ab0b0422019cf64a1a018605b