From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 18 Mar 2016 20:13:34 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.25'
X-Git-Tag: v1.0.25
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4b5af08e71f1df3eb0ac37961ba8b928350b55d6;p=WP-Themes%2Fsaultstemarie.git

Merge branch 'hotfix/1.0.25'
---

290ae1f7c51c9997b998e168d28a5f9ed18aa091