From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 19 Aug 2016 16:10:48 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.11'
X-Git-Tag: v1.0.11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=21ab1a8871d423db2ff4e368612cc9db78275fe8;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.11'
---

c003bbb67c02120cd1868082567cd9dcfefb08ee