Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 19 Feb 2016 19:53:20 +0000 (14:53 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 19 Feb 2016 19:53:20 +0000 (14:53 -0500)

Trivial merge