From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 18 Jan 2017 15:40:43 +0000 (-0500)
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=14014668e030b7ba9811df1375731e13c7429ac8;p=web%2Fwww.mackinawmemorialparade.com.git

Merge branch 'hotfix/1.0.1'
---

c1049ddc0f00ebe2471643c58f1b81dd3368f868