From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 23 Oct 2015 12:25:25 +0000 (-0400)
Subject: Merge branch 'release/1.2.2'
X-Git-Tag: v1.2.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e338198c41549711dbed2280f78dd8e831729b3d;p=WP-Plugins%2Fglm-blocks.git

Merge branch 'release/1.2.2'
---

e338198c41549711dbed2280f78dd8e831729b3d