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

Merge branch 'release/1.2.4'
---

fa73010e8e398f42ce73a12d5ebf111c7d26d8c1