From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 27 Dec 2016 20:52:53 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.7'
X-Git-Tag: v1.1.7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=058c62fa38bf6fd00e6a944d90f162b4560f1fe5;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.1.7'
---

c599064bd37802e670aee67290aa76ab197d7af6