From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 21 Dec 2015 19:02:18 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.4'
X-Git-Tag: v1.0.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=05b0b426ea6c852f1e537413a5cd730bfc584bdc;p=WP-Plugins%2Fglm-member-db-packaging.git

Merge branch 'hotfix/1.0.4'
---

05b0b426ea6c852f1e537413a5cd730bfc584bdc