From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 8 Jul 2016 17:21:54 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.3'
X-Git-Tag: v1.1.3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6f2c305075b5a5619584d563f21191a7d16376e2;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.1.3'
---

e3de5ae0c1a189c460d8c621b6560ab3ce4e926e