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

Merge tag 'v1.1.1' into develop

Version 1.1.1
---

ca8c0879f70a392d3cfdc7a7fb89f8f5a4daae4f