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

Merge branch 'hotfix/1.0.18'
---

370a658e63f9324c400a48a0ac86679e2281cea9