From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 29 Apr 2016 15:45:11 +0000 (-0400)
Subject: Merge tag 'v1.1.0' into develop
X-Git-Tag: v1.1.9^2~11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=dc1aae9086959e2d0c83e019b411aa3b2a320288;p=WP-Themes%2Fjollylama.git

Merge tag 'v1.1.0' into develop

Version 1.1.0
---

dc1aae9086959e2d0c83e019b411aa3b2a320288