From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 19 Feb 2016 19:20:01 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.20'
X-Git-Tag: v1.0.20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=571039a40d104666c4456677c6a5ba9459f7e105;p=WP-Themes%2Fsaultstemarie.git

Merge branch 'hotfix/1.0.20'
---

0023af917c08b18a5aabbde1bdc0d3beccacc258