From: Greg Sabino Mullane <greg@endpoint.com>
Date: Wed, 3 Feb 2016 20:07:07 +0000 (-0500)
Subject: Merge branch 'master' of bucardo.org:/var/lib/git/bucardo
X-Git-Tag: 5.4.1~3
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=3349211ecfc7dfb39f13a172cf5abfd7e69683f9;p=bucardo.git

Merge branch 'master' of bucardo.org:/var/lib/git/bucardo
---

3349211ecfc7dfb39f13a172cf5abfd7e69683f9