From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 28 Jul 2016 13:39:07 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.5'
X-Git-Tag: v1.0.5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d6ca8000fb5dfe93b203d9cc59acb0791690d77a;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.5'
---

4a748758ff11f62cca69637e5d96d415be4f4449