From: Ian Weller <ian@gaslightmedia.com>
Date: Mon, 20 Jun 2016 13:09:10 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:WP-Themes/parrotslanding into develop
X-Git-Tag: v1.0.0^2~17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=127844ea648a053abedb925389892a6eb29aa9dc;p=WP-Themes%2Fparrotslanding.git

Merge branch 'develop' of cvs2:WP-Themes/parrotslanding into develop
---

127844ea648a053abedb925389892a6eb29aa9dc