Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 31 Mar 2016 20:47:46 +0000 (16:47 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 31 Mar 2016 20:47:46 +0000 (16:47 -0400)

Trivial merge