From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 28 Apr 2016 13:46:37 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=46a96a4fdf1f6fb22d8da40b0efeea52cb78a233;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.0.2'
---

a89a0168bb66c7359c77cf3709afeada82bd4be4