Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 23 Sep 2015 17:41:45 +0000 (13:41 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 23 Sep 2015 17:41:45 +0000 (13:41 -0400)

Trivial merge