From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 30 Nov 2015 13:57:45 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.4'
X-Git-Tag: v1.1.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=63873b658288defadd827ba84d36f82c159d43be;p=WP-Themes%2FDarkSkiesEmmet.git

Merge branch 'hotfix/1.1.4'
---

49d19d60b634e4234ef10e8dcfe963fe5ceb8f59