From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 17 Jul 2015 19:44:47 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2e8c224318a03e9807979d1a73a698762b051f2c;p=WP-Themes%2FDarkSkiesEmmet.git

Merge branch 'hotfix/1.0.4'
---

f8b794051196c4d6764e3cc90c8312db6a79ec4d