From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 28 Oct 2016 18:26:22 +0000 (-0400)
Subject: Merge branch 'develop' into feature/beerweek
X-Git-Tag: v1.5.4^2~33^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ffeature%2Fbeerweek;p=WP-Plugins%2Fglm-member-db-events.git

Merge branch 'develop' into feature/beerweek
---

bda76c11cfacd6a70fa3857ec881ce0f11b7a612