From: Ian Weller <ian@gaslightmedia.com>
Date: Fri, 4 Nov 2016 14:26:21 +0000 (-0400)
Subject: Merge tag 'v1.1.5' into develop
X-Git-Tag: v1.1.9^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ce8bbcc1457dc1e8fb74c6f906e2243af9e8c642;p=WP-Themes%2Fjollylama.git

Merge tag 'v1.1.5' into develop

version 1.1.5
---

ce8bbcc1457dc1e8fb74c6f906e2243af9e8c642