From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 11 May 2015 15:40:29 +0000 (-0400)
Subject: Merge tag 'v1.2.0' into develop
X-Git-Tag: v1.2.1~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=0f2e75f24c9409d5b46414e1b1f6cdc6d7cff382;p=WP-Plugins%2Fglm-blocks.git

Merge tag 'v1.2.0' into develop

Version 1.2.0
---

0f2e75f24c9409d5b46414e1b1f6cdc6d7cff382