From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 3 May 2016 14:01:37 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.16'
X-Git-Tag: v1.0.16^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e11532ea482472cd42083e0509c988b0fb88537a;p=WP-Themes%2FFairEmmet.git

Merge branch 'hotfix/1.0.16'
---

e11532ea482472cd42083e0509c988b0fb88537a