From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 11 Aug 2016 16:01:06 +0000 (-0400)
Subject: Merge tag 'v1.1.10' into develop
X-Git-Tag: v1.1.14^2~10
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=631ae51c5972b6577345a113aaafdc9ccc2c62eb;p=WP-Plugins%2Fglm-member-db-packaging.git

Merge tag 'v1.1.10' into develop

Fixed merge conflict that made it into hotfix.
---

631ae51c5972b6577345a113aaafdc9ccc2c62eb