From: Ian Weller Date: Thu, 19 May 2016 19:04:38 +0000 (-0400) Subject: Merge branch 'hotfix/1.0.20' X-Git-Tag: v1.0.20 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=278290d0b6e8dd454d23d0fc41e2a5d649cf971f;p=WP-Themes%2FFairEmmet.git Merge branch 'hotfix/1.0.20' --- 8a564f2795576cedab59964451a61051c0b07138