From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 17 Nov 2015 20:11:16 +0000 (-0500)
Subject: Merge branch 'release/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3198d4298684e4c8ead5d8d9a936411845828d8e;p=WP-Themes%2FFairEmmet.git

Merge branch 'release/1.0.4'
---

3198d4298684e4c8ead5d8d9a936411845828d8e