From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 29 Aug 2016 15:24:54 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.4'
X-Git-Tag: v1.1.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b0a4107ac9cb458b4de5428d366cc2d96042ef27;p=WP-Themes%2Fsaultstemarie.git

Merge branch 'hotfix/1.1.4'
---

502ee76ced8687804af73b77af4c51be1189d688