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

Merge tag 'v1.1.6' into develop

Version 1.1.6
---

d494e10991c17e329289e9b844fd23868d4e5328