Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 6 Jan 2017 18:58:38 +0000 (13:58 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 6 Jan 2017 18:58:38 +0000 (13:58 -0500)

Trivial merge