From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 22 Jun 2016 14:49:32 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=9638e118eda8840e7b1254391ba4be439a96a25a;p=WP-Themes%2Fparrotslanding.git

Merge branch 'hotfix/1.0.2'
---

9638e118eda8840e7b1254391ba4be439a96a25a