From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 28 Sep 2015 16:55:36 +0000 (-0400)
Subject: Merge branch 'release/1.0.22'
X-Git-Tag: v1.0.23~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=be734ad90282ef26ccac2e5c46138bec1f7c02c6;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'release/1.0.22'

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

be734ad90282ef26ccac2e5c46138bec1f7c02c6