From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 17 Feb 2017 16:34:54 +0000 (-0500)
Subject: Merge branch 'master' into develop
X-Git-Tag: v1.0.2^2~5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=5486f3ff0b67375b7703815ccf2ca19faaa18785;p=WP-Plugins%2Fglm-member-db-sample.git

Merge branch 'master' into develop
---

5486f3ff0b67375b7703815ccf2ca19faaa18785