From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 30 Aug 2016 17:00:54 +0000 (-0400)
Subject: Merge branch 'release/2.5.4'
X-Git-Tag: v2.5.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8ac38da9db79b155a56d4743c81027f690f2a12b;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'release/2.5.4'
---

8ac38da9db79b155a56d4743c81027f690f2a12b