From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 19 Aug 2016 13:22:45 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.10'
X-Git-Tag: v1.0.10
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0a586b828e63f7974f21f93e009be7f41ccb6d0e;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.10'
---

b7db6d6f6eb45366d405d850c854a20292e682ed