From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 4 Dec 2015 16:03:44 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.18'
X-Git-Tag: V1.1.18^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4a0ef6e3b99de0a018c1ad21489bae00c8ce68d1;p=WP-Themes%2FGovernmentEmmet.git

Merge branch 'hotfix/1.1.18'
---

4a0ef6e3b99de0a018c1ad21489bae00c8ce68d1