From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 5 Apr 2016 16:15:28 +0000 (-0400)
Subject: Merge branch 'develop' into settings
X-Git-Tag: v1.0.0^2~128
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6033e0a7943d0c6eba7774027b1bd766a4bdbddc;p=WP-Plugins%2Fglm-member-db-events.git

Merge branch 'develop' into settings
---

6033e0a7943d0c6eba7774027b1bd766a4bdbddc