Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 9 Mar 2016 20:52:44 +0000 (15:52 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 9 Mar 2016 20:52:44 +0000 (15:52 -0500)

Trivial merge