From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 7 Jul 2016 20:15:36 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.21'
X-Git-Tag: v1.0.21^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=fdda11ef63c45cac54bc4c267cdd86e5ecd3d3bd;p=WP-Themes%2FFairEmmet.git

Merge branch 'hotfix/1.0.21'
---

fdda11ef63c45cac54bc4c267cdd86e5ecd3d3bd