From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 3 May 2016 18:07:01 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.18'
X-Git-Tag: v1.0.18
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9347cf5ab3b18ab8b6001fbe519864a5adbd31d2;p=WP-Themes%2FFairEmmet.git

Merge branch 'hotfix/1.0.18'
---

0d9623cc328c6eb12f06249d0eeb9541f2a47f0e