From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 4 Aug 2016 17:00:07 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.6'
X-Git-Tag: v1.0.6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=11b7d4da5deb0f9f656f652639b24782e4a96b49;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.6'
---

1e03ba419a294dc171b95293a98b569122ba5368