From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 27 Oct 2016 20:36:45 +0000 (-0400)
Subject: Merge tag 'v1.1.4' into develop
X-Git-Tag: v1.1.9^2~7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=89fcb89076899d420ecf5cbd70cced6bfd42b6b4;p=WP-Themes%2Fjollylama.git

Merge tag 'v1.1.4' into develop

v1.1.4
---

89fcb89076899d420ecf5cbd70cced6bfd42b6b4