From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 6 Jul 2016 16:43:04 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e313ddc66ba9de3b7e0179acf098c91c8db8f17f;p=WP-Themes%2FDiscoverKZOO.git

Merge branch 'hotfix/1.0.4'
---

e313ddc66ba9de3b7e0179acf098c91c8db8f17f