Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 26 Feb 2016 16:02:51 +0000 (11:02 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 26 Feb 2016 16:02:51 +0000 (11:02 -0500)

Trivial merge