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

Merge branch 'hotfix/1.0.2'
---

e9e123c7b7c3b149c8be672248761b0ce4508092