From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 11 May 2016 14:12:59 +0000 (-0400)
Subject: Merge branch 'release/1.2'
X-Git-Tag: v1.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3d9211005d38766bac80e462355bf86857b52b89;p=web%2FCityofMI.git

Merge branch 'release/1.2'
---

3d9211005d38766bac80e462355bf86857b52b89