From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 18 May 2016 18:11:48 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.12'
X-Git-Tag: v1.1.12^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=bf61a7819a617ec8b3dcfc94e19a01f28d578d22;p=WP-Themes%2FDarkSkiesEmmet.git

Merge branch 'hotfix/1.1.12'
---

bf61a7819a617ec8b3dcfc94e19a01f28d578d22