From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 28 Apr 2016 13:31:17 +0000 (-0400)
Subject: Merge branch 'release/1.0.0'
X-Git-Tag: v1.0.0^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=35067d70b270ce21e2d2f76bb767e891d62431d3;p=WP-Themes%2Fjollylama.git

Merge branch 'release/1.0.0'
---

35067d70b270ce21e2d2f76bb767e891d62431d3