Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 19 Apr 2010 10:59:31 +0000 (12:59 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 19 Apr 2010 10:59:31 +0000 (12:59 +0200)
1  2 
src/client.c

diff --cc src/client.c
Simple merge