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

Merge tag 'v1.0.2' into develop

v1.0.2
---

c358b92aab8b2d39bbfef0db2ed27370fc5f71a1