From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 15 Mar 2016 15:34:54 +0000 (-0400)
Subject: Merge branch 'develop' into feature/steve
X-Git-Tag: v1.0.0^2~164^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=36a024d001e3ce23dbba988b9bd071de957d2eab;p=WP-Plugins%2Fglm-member-db-events.git

Merge branch 'develop' into feature/steve
---

36a024d001e3ce23dbba988b9bd071de957d2eab