From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 10 Jan 2017 21:22:23 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.25'
X-Git-Tag: v1.0.25^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=276288b64417b0746a36338ec13541827c920df2;p=WP-Themes%2FFairEmmet.git

Merge branch 'hotfix/1.0.25'
---

276288b64417b0746a36338ec13541827c920df2