Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 24 May 2016 20:40:57 +0000 (16:40 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 24 May 2016 20:40:57 +0000 (16:40 -0400)

Trivial merge