From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 19 May 2016 18:12:19 +0000 (-0400)
Subject: Merge tag 'v1.1.2' into develop
X-Git-Tag: v1.1.9^2~9
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=55526a04f29e906d41a14aa223713b40a56e0b6e;p=WP-Themes%2Fjollylama.git

Merge tag 'v1.1.2' into develop

version 1.1.2
---

55526a04f29e906d41a14aa223713b40a56e0b6e