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

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

7ecea07ded8faebfead3d59ef74a56f3e7655a36