From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 22 Dec 2015 18:13:47 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.25'
X-Git-Tag: v1.1.25
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f7e4704e9a6ccdd316d956f780d6c1f0f5f8bc61;p=WP-Themes%2FGovernmentEmmet.git

Merge branch 'hotfix/1.1.25'
---

299fb553c702c1df62be582cc0062518808deee5