Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 16 Aug 2010 12:28:05 +0000 (14:28 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 16 Aug 2010 12:28:05 +0000 (14:28 +0200)
Conflicts:
src/client.c


Trivial merge