Merge branch 'bdr-plugin/next' of ssh://git.postgresql.org/2ndquadrant_bdr into bdr...
authorkforte90 <kathy.forte@2ndquadrant.com>
Thu, 19 Mar 2015 22:55:17 +0000 (15:55 -0700)
committerkforte90 <kathy.forte@2ndquadrant.com>
Thu, 19 Mar 2015 22:55:17 +0000 (15:55 -0700)
1  2 
doc/bdr.sgml
doc/filelist.sgml

diff --cc doc/bdr.sgml
Simple merge
Simple merge