From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 21 Dec 2016 20:23:23 +0000 (-0500)
Subject: Merge branch 'hotfix/0.3.1'
X-Git-Tag: v0.3.1^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=1f612ad40b1b334d9126c7e4a9121ee575602cf7;p=WP-Themes%2Foriginalbutterflyhouse.git

Merge branch 'hotfix/0.3.1'
---

1f612ad40b1b334d9126c7e4a9121ee575602cf7