From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 5 Dec 2016 18:07:15 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7b033f1894a06ff255a4e86365c12cc759949cdb;p=web%2Fwww.classiccarcocoon.com.git

Merge branch 'hotfix/1.0.4'
---

7b033f1894a06ff255a4e86365c12cc759949cdb