From: Bernd Helmle <mailings@oopsware.de>
Date: Wed, 29 Apr 2015 20:57:48 +0000 (+0200)
Subject: Merge branch 'master' into disable_trust_ident
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=refs%2Fheads%2Fdisable_trust_ident;p=users%2Fbernd%2Fpostgres.git

Merge branch 'master' into disable_trust_ident
---

99ab8cabc02b9ed2717af651203b42f11e6a8276