From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 27 Sep 2016 14:50:46 +0000 (-0400)
Subject: Merge branch 'develop' into feature/dashboard
X-Git-Tag: v1.5.0^2~1^2~10
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=aff2dead04a2c8af5c37c71f43e9e2da172bb166;p=WP-Plugins%2Fglm-member-db-events.git

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

aff2dead04a2c8af5c37c71f43e9e2da172bb166