From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 27 Jul 2016 18:11:22 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.1'
X-Git-Tag: v1.0.1^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5e30b8c74f4b174db619cc91a9b0832eb744eade;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.1'
---

5e30b8c74f4b174db619cc91a9b0832eb744eade