From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 15 Jun 2016 20:35:16 +0000 (-0400)
Subject: Merge branch 'hotfix/2.1.4'
X-Git-Tag: v2.1.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8957675931b67164552836b7f820754cc226dbd2;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'hotfix/2.1.4'
---

8957675931b67164552836b7f820754cc226dbd2