From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 27 Jul 2016 18:36:08 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ed08a667443d5ddd0f55dbf6c77f85fbf19ebbe0;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.2'
---

8be867a07a0010db8f10f0aeb93cb4cf723e4c20