From: Chuck Scott <cscott@gaslightmedia.com>
Date: Sat, 3 Oct 2015 16:08:44 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
X-Git-Tag: v1.0.28^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6a0b83f0400a23d27c4b6ec07f5505864431994b;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop

Conflicts:
	views/front/members/detail.html
---

6a0b83f0400a23d27c4b6ec07f5505864431994b