From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 15 Aug 2016 20:14:04 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.5'
X-Git-Tag: v1.2.5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d8028a2fae4d232aeddf7886f4ea57c3da08b8bf;p=WP-Themes%2FGovernmentEmmet.git

Merge branch 'hotfix/1.2.5'
---

0194c73a8b0d87cf2dd4abb0a222765950eeb4de