Merge branch 'develop' into release/1.0.55
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:25:07 +0000 (15:25 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:25:07 +0000 (15:25 -0500)
commitbc19e186c1b1a64112ac4a09716dc01b17fb41d8
tree4eb9e98e40c2a749075c53f6642f0b34ded74d64
parentfbac39e6f4bfebe8d5708000cc0379359158b159
parente8c51deac660ba1bfb077eccc55d60513990b951
Merge branch 'develop' into release/1.0.55

Conflicts:
glm-member-db.php
glm-member-db.php