Merge branch 'master' of ssh://git.postgresql.org/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Tue, 16 Dec 2014 17:45:16 +0000 (12:45 -0500)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Tue, 16 Dec 2014 17:45:16 +0000 (12:45 -0500)
commit209a5d8d8c34f0cadf08dbb4d8fcc3fba0d4cdd2
treeff7b7aec48c421d0362a2c7e96f557481cfa848b
parent936d87d345c2da7b054a3a58a1e44f1f27378613
parent0a1958dc65290e32d98299642a0646741dfcce0e
Merge branch 'master' of ssh://git.postgresql.org/slony1-engine

Conflicts:
RELEASE