From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 12 Feb 2016 14:42:45 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.14'
X-Git-Tag: v1.0.14^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c9e8622d0770dac25d938580c703348cdc27b17d;p=WP-Themes%2Fsaultstemarie.git

Merge branch 'hotfix/1.0.14'
---

c9e8622d0770dac25d938580c703348cdc27b17d