From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 3 Oct 2016 12:23:32 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.11'
X-Git-Tag: v1.2.11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f1ee24f878d4f2845e71076fad5066f3f797f9f7;p=WP-Themes%2FGovernmentEmmet.git

Merge branch 'hotfix/1.2.11'
---

c16d2df2d5168be2e99658bf2e7ff6d109c06cee