From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 2 Nov 2016 15:41:20 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.15'
X-Git-Tag: v1.0.15
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c044cdf654c7bed20aa611c6cf1bd136e04428f1;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.15'
---

be9ee695507fc4093c4e6debf39dcf05fc8c3eb4