From: Ove Klykken <ove@gaslightmedia.com>
Date: Mon, 4 Aug 2014 18:47:38 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:web/CityofMI into develop
X-Git-Tag: VV1^2~7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=145d44d6c1618a8bc38ced5d8c36e6bde2e20dcd;p=web%2FCityofMI.git

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

145d44d6c1618a8bc38ced5d8c36e6bde2e20dcd