From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 10 Jan 2017 19:40:10 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.5'
X-Git-Tag: v1.2.5^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e18d8079c0b999c5e5574c46e97e75c5df65e4d5;p=WP-Plugins%2Fglm-member-db-packaging.git

Merge branch 'hotfix/1.2.5'
---

e18d8079c0b999c5e5574c46e97e75c5df65e4d5