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

Merge branch 'hotfix/1.0.5'
---

e21cb5bde718c94be1317c83923de9691772c851