From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 8 Dec 2016 16:13:14 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.3'
X-Git-Tag: 1.0.3^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=19e8bf2f4b06d3102eaa397bed5a322e3a126354;p=WP-Themes%2Foriginalbutterflyhouse.git

Merge branch 'hotfix/1.0.3'
---

19e8bf2f4b06d3102eaa397bed5a322e3a126354