From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 27 Jul 2016 20:05:29 +0000 (-0400)
Subject: Merge branch 'release/1.0.4'
X-Git-Tag: v1.0.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5a52b75281068185134e7fde291809e0e8ea9921;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'release/1.0.4'
---

50d1abb802eda73d23cc5def19fac1d14ed0e80b