Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 26 Jan 2016 17:35:42 +0000 (12:35 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 26 Jan 2016 17:35:42 +0000 (12:35 -0500)

Trivial merge