From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 28 Dec 2016 18:10:30 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.15'
X-Git-Tag: v1.2.15
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7f2c890dcc8b73b19854542ad4799502cdb5d76c;p=WP-Themes%2FGovernmentEmmet.git

Merge branch 'hotfix/1.2.15'
---

13575831b87e1ac42b163afc65409ddcf445a2e7