From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 5 Aug 2014 18:38:50 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.1'
X-Git-Tag: v1.0.1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f8718aceaf9f7da34f1d409fb8783f5b88beb3fa;p=web%2FCityofMI.git

Merge branch 'hotfix/1.0.1'
---

edcb6a06c7bc0981eeb99d69aef455d3245a5038