From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 18 Apr 2016 14:58:08 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.6'
X-Git-Tag: v1.1.6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=aa5040800b1c18bb03d1345e5e829f1227f9a9f9;p=WP-Themes%2FDarkSkiesEmmet.git

Merge branch 'hotfix/1.1.6'
---

4ea8f845257c679ed4233dbe0a29ed15dbc0630b