From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 21 Dec 2016 20:25:35 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=578398269f52f53bd4fe8c0210965eee663ca7db;p=WP-Themes%2Foriginalbutterflyhouse.git

Merge branch 'hotfix/1.0.4'
---

d659e8ca405f3394ac4b05d3be6d11aa49cb0883