Merge branch 'dccp'
authorAndre <maan@p133.(none)>
Sat, 11 Mar 2006 16:45:20 +0000 (17:45 +0100)
committerAndre <maan@p133.(none)>
Sat, 11 Mar 2006 16:45:20 +0000 (17:45 +0100)
commit1f556ae88bd8c85d4452f689f532f5a6abeabe92
tree875f7299fa8ea2c46b606e74006afacdda54f36d
parent63afe815dbecded66415b041a98c5bc1b060dc95
parentabbddde3ee707103d5d8b088c8fa6fc53f09ebff
Merge branch 'dccp'

Fix up merge conflicts by hand.
Conflicts:

configure.ac
error.h
server.ggo
configure.ac
error.h
server.c
server.ggo