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

Merge branch 'hotfix/1.0.12'
---

d07176f0c90ad2d9760a67de24da4dc6916e4a44