From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 3 Dec 2015 19:15:11 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.17'
X-Git-Tag: V1.1.17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5f7e93f405081958a26944f601b4ff9de064e41a;p=WP-Themes%2FGovernmentEmmet.git

Merge branch 'hotfix/1.1.17'
---

71c840e6ab929e9e2f85e7df6346f29bfad2b88c