From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 13 Jul 2016 19:32:11 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.17'
X-Git-Tag: v1.0.17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2fadbd1b69ce6bb50a627f8df7af4266f2c96852;p=WP-Themes%2Fcamppetosega.git

Merge branch 'hotfix/1.0.17'
---

46d39d49e115a207474faed53adc9579a9543da5