From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Tue, 29 Nov 2011 17:02:59 +0000 (-0500)
Subject: Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
X-Git-Tag: REL_2_2_0_B1~20^2~1
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=1c906450b91025b814413846d495ca4e1bf393e2;p=slony1-engine.git

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

1c906450b91025b814413846d495ca4e1bf393e2