From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Mon, 16 Sep 2013 17:01:03 +0000 (-0400)
Subject: Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=074148ba3da167f012d597961d6c8227fd8cd43d;p=slony1-engine.git

Merge branch 'master' of git://git.postgresql.org/git/slony1-engine

Conflicts:
	RELEASE
	doc/adminguide/ddlchanges.sgml
---

074148ba3da167f012d597961d6c8227fd8cd43d