From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 1 Jun 2016 19:04:06 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.4'
X-Git-Tag: v1.1.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=fbe056466feec0eaa6f931ff2da35f07e14eec76;p=WP-Themes%2Fkeweenaw.git

Merge branch 'hotfix/1.1.4'
---

fbe056466feec0eaa6f931ff2da35f07e14eec76