Merge branch '2015.11-pgsql' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Jun 2016 09:33:12 +0000 (11:33 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Jun 2016 09:33:12 +0000 (11:33 +0200)

Trivial merge