From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 18 Apr 2016 20:56:47 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.7'
X-Git-Tag: v1.1.7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7af969b2dc45240dc3f1800e6bd1aa3934527aa8;p=WP-Themes%2FDarkSkiesEmmet.git

Merge branch 'hotfix/1.1.7'
---

fee0357fb32065b1befef42a95f05defe4407eb1