From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 18 Aug 2016 15:29:43 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.17'
X-Git-Tag: v1.1.17^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0838f8c0d3e07c8acbfb28f1853d1e0bdafa5ee6;p=WP-Themes%2FDarkSkiesEmmet.git

Merge branch 'hotfix/1.1.17'
---

0838f8c0d3e07c8acbfb28f1853d1e0bdafa5ee6