From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 19 May 2016 18:11:46 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.2'
X-Git-Tag: v1.1.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=66e6a91f17b250882e4e9d4776677fe29e99c272;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.1.2'
---

66e6a91f17b250882e4e9d4776677fe29e99c272