From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 8 Jul 2016 18:05:12 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.14'
X-Git-Tag: v1.1.14
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=cd653b52abfc4334e068c4bf4e9aa64de0a8671a;p=WP-Themes%2FDarkSkiesEmmet.git

Merge branch 'hotfix/1.1.14'
---

21bf2355920c8c129794132bc4a7de4c5937d0c1