From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 1 Dec 2016 17:42:10 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=18f4fd8c3aab32f1c36a52395522a6eae21b65c5;p=web%2Fwww.classiccarcocoon.com.git

Merge branch 'hotfix/1.0.2'
---

5ab38731463e9de15ba1aa9d615d6c6c7bf49002