From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 18 Mar 2016 20:02:00 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.5'
X-Git-Tag: v1.1.5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ddf53b15cbaf616e777b999521399aec390f9930;p=WP-Themes%2FDarkSkiesEmmet.git

Merge branch 'hotfix/1.1.5'
---

57f0249cfd32dc6e20a2ba2a4a89edb8c747160a