Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 14 Jun 2016 19:26:22 +0000 (15:26 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 14 Jun 2016 19:26:22 +0000 (15:26 -0400)

Trivial merge