From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 7 Dec 2016 14:15:49 +0000 (-0500)
Subject: Merge branch 'release/1.0.0'
X-Git-Tag: v1.0.0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a15dc94e58829feb39831aef48e60f7f44b7c8a0;p=WP-Themes%2Foriginalbutterflyhouse.git

Merge branch 'release/1.0.0'
---

55a31174b8d663d000b427ce5051b9c6af908e5a