Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 31 Jan 2017 17:50:06 +0000 (12:50 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 31 Jan 2017 17:50:06 +0000 (12:50 -0500)

Trivial merge