From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 14 Jul 2016 17:06:16 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.21'
X-Git-Tag: v1.0.21
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c3190eaca915243a97026a5b0186ab6a49c46166;p=WP-Themes%2Fcamppetosega.git

Merge branch 'hotfix/1.0.21'
---

e03db4990f0eea9a33e498372aac64ac302b0d80