From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 7 Dec 2016 19:39:30 +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=007abbccbad6e9130ba674016cb18b76af8845c1;p=WP-Themes%2Foriginalbutterflyhouse.git

Merge branch 'hotfix/1.0.1'
---

fb8c2eb0cbc0b9878792818081462776b069a4de