From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 14 Jan 2015 16:31:19 +0000 (-0500)
Subject: Merge branch 'release/1.1.1'
X-Git-Tag: v1.1.1^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4f4c599f2532bd084de1bf19b43685aa676be772;p=WP-Plugins%2Fglm-blocks.git

Merge branch 'release/1.1.1'
---

4f4c599f2532bd084de1bf19b43685aa676be772