Merge tag 'v1.0.20' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 21 Jan 2016 15:44:44 +0000 (10:44 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 21 Jan 2016 15:44:44 +0000 (10:44 -0500)
commitbb9267fa66b89c0484305d405b729c70413540b6
tree7c44c0819e60f39274a1d1b15419719cfc57d8ba
parent198a685f8161e74f2af9faed8e74ac4fa1417e5c
parentc9c3cfde0aa91894210a3c50abc077861d8c05d2
Merge tag 'v1.0.20' into develop

1.0.20

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