From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 21 Jun 2016 15:04:50 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.1'
X-Git-Tag: 1.0.1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7c3d50ca1e2602fe54d201baa1e0a88f746e31f2;p=WP-Themes%2Fparrotslanding.git

Merge branch 'hotfix/1.0.1'
---

96df460f00bb4dacfd8d9b79b8eec4404601e959