From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 29 Apr 2016 15:45:05 +0000 (-0400)
Subject: Merge branch 'release/1.1.0'
X-Git-Tag: v1.1.0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9a257974cd408bcad1ee3aa17ea39b65438206f7;p=WP-Themes%2Fjollylama.git

Merge branch 'release/1.1.0'
---

3b85f7994487f0c2ad29d6d804f2caf8c093c72e