From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 19 May 2016 18:51:28 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.12'
X-Git-Tag: v1.1.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d6d8c194a0970352e46f58ebea711fd2b7001d1a;p=WP-Themes%2FEMSEmmet.git

Merge branch 'hotfix/1.1.12'
---

e38685771dc82896f20ef5925bfe90ba808fe8b8