From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 28 Apr 2016 13:35:42 +0000 (-0400)
Subject: Merge tag 'v1.0.1' into develop
X-Git-Tag: v1.1.0^2~11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=de8df357cf3fa95be1382b2c210c9316b7f71681;p=WP-Themes%2Fjollylama.git

Merge tag 'v1.0.1' into develop

v1.0.1
---

de8df357cf3fa95be1382b2c210c9316b7f71681