From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 23 Jul 2015 19:53:59 +0000 (-0400)
Subject: Merge branch 'release/1.2.1'
X-Git-Tag: v1.2.2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=c1e681ad581db07c99eb184b754b84cb4eeaa1b2;p=WP-Plugins%2Fglm-blocks.git

Merge branch 'release/1.2.1'
---

c1e681ad581db07c99eb184b754b84cb4eeaa1b2