From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 14 Oct 2016 19:16:23 +0000 (-0400)
Subject: Merge branch 'develop' into feature/dashboard
X-Git-Tag: v1.2.0^2~1^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=98138430b5a8c81b7f097800a8ae3154b689ca82;p=WP-Plugins%2Fglm-member-db-packaging.git

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

98138430b5a8c81b7f097800a8ae3154b689ca82