From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 5 Aug 2014 18:49:43 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=220cc00098d43612a07f13818d80bbb4d8b5900f;p=web%2FCityofMI.git

Merge branch 'hotfix/1.0.2'
---

220cc00098d43612a07f13818d80bbb4d8b5900f