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^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=e3de5ae0c1a189c460d8c621b6560ab3ce4e926e;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.1.3'
---

e3de5ae0c1a189c460d8c621b6560ab3ce4e926e