From: Chuck Scott <cscott@gaslightmedia.com>
Date: Wed, 15 Jun 2016 16:02:18 +0000 (-0400)
Subject: Merge branch 'hotfix/2.1.1'
X-Git-Tag: v2.1.1^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=964b20e5c00bcb74b394275760002d7be23ac272;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'hotfix/2.1.1'
---

964b20e5c00bcb74b394275760002d7be23ac272