Merge commit 'refs/remotes/pubserv/master'
authorfredrik <fredrik@959494ce-11ee-0310-bf91-de5d638817bd>
Mon, 4 Jun 2007 19:15:10 +0000 (19:15 +0000)
committerfredrik <fredrik@959494ce-11ee-0310-bf91-de5d638817bd>
Mon, 4 Jun 2007 19:15:10 +0000 (19:15 +0000)
Conflicts:

clients/gtk2/main.c

git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@1062 959494ce-11ee-0310-bf91-de5d638817bd


No differences found