From: laury <laury@gaslightmedia.com>
Date: Mon, 6 Jun 2016 20:29:38 +0000 (-0400)
Subject: Merge conflict
X-Git-Tag: v2.1^2~18
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c79ff667ad76e5dc780ab7414d1d449398dc4e20;p=WP-Plugins%2Fglm-member-db.git

Merge conflict
---

c79ff667ad76e5dc780ab7414d1d449398dc4e20