From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 4 Nov 2016 14:25:33 +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=e9ece8f9b55b69164d609ed1ad2cf4fb2c709e87;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.1.5'
---

47922f0c4e89a628dec4c9c61c8d8b4038ea1834