From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 17 Feb 2016 21:18:05 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.17'
X-Git-Tag: v1.0.17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5fac8be2f45f9c37bf2bd0c58127b302c1fa9b21;p=WP-Themes%2Fsaultstemarie.git

Merge branch 'hotfix/1.0.17'
---

b1153b79ca73c6547a99a50742798970d82a87e7