Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 16 Sep 2013 17:01:03 +0000 (13:01 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 16 Sep 2013 17:01:03 +0000 (13:01 -0400)
commit074148ba3da167f012d597961d6c8227fd8cd43d
treeded2292e38b748e1b26e0df4d5e392c731ea1f1d
parentacbb608cd8e148edd6780462978b2b84b2275a9d
parent52e6127d264662997e69bf0d07f947aebf4c7c61
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine

Conflicts:
RELEASE
doc/adminguide/ddlchanges.sgml