From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 10 Feb 2016 15:46:40 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.11'
X-Git-Tag: v1.0.11^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=df25cb5874e667daec623b1175dc25a23ac4f12e;p=WP-Themes%2Fsaultstemarie.git

Merge branch 'hotfix/1.0.11'
---

df25cb5874e667daec623b1175dc25a23ac4f12e