Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 8 Mar 2016 18:34:05 +0000 (13:34 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 8 Mar 2016 18:34:05 +0000 (13:34 -0500)

Trivial merge