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

Merge branch 'hotfix/1.0.12'
---

b0cdff8134469ce8f1ba03342f503deb1d81f27e