From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 3 May 2016 15:16:39 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.17'
X-Git-Tag: v1.0.17^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=32dc2ce6532ecbcffa8c699436cdd24f0cda5271;p=WP-Themes%2FFairEmmet.git

Merge branch 'hotfix/1.0.17'
---

32dc2ce6532ecbcffa8c699436cdd24f0cda5271