From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 19 Feb 2016 17:12:27 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.21'
X-Git-Tag: v1.0.21
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fcf8be73df9146e1b7b32565bb35a6ca29ef3389;p=WP-Themes%2Fsaultstemarie.git

Merge branch 'hotfix/1.0.21'
---

505e9df0a24095d445553715b5715045629e80b1