From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 7 Oct 2016 19:20:57 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.7'
X-Git-Tag: v1.1.7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=935adc456a8bf9837f6bba4b6bbaa502e852c871;p=WP-Themes%2Fsaultstemarie.git

Merge branch 'hotfix/1.1.7'
---

2feb54be6fee64c5272b65d1a1292982cfa68e47