From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 19 Aug 2016 19:21:55 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.20'
X-Git-Tag: v1.1.20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f21976dce3ff2dba37c6be21dfbefb4d2ef0b294;p=WP-Themes%2FDarkSkiesEmmet.git

Merge branch 'hotfix/1.1.20'
---

a988ca6a8a9394ce23fa1792638a71a70925c940