From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 28 Sep 2015 16:47:49 +0000 (-0400)
Subject: Further attempt to resolve merge conflicts
X-Git-Tag: v1.0.22~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ca4cd155ae4a30cd97588fd85dc40de4cdab8001;p=WP-Plugins%2Fglm-member-db.git

Further attempt to resolve merge conflicts
---

ca4cd155ae4a30cd97588fd85dc40de4cdab8001