Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 21 Mar 2016 19:49:46 +0000 (15:49 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 21 Mar 2016 19:49:46 +0000 (15:49 -0400)

Trivial merge