From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 4 Mar 2016 14:07:26 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.14'
X-Git-Tag: v1.0.14^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=1aaff7b98ca34b82e17be4c491911cf92edffc7b;p=WP-Themes%2FFairEmmet.git

Merge branch 'hotfix/1.0.14'
---

1aaff7b98ca34b82e17be4c491911cf92edffc7b