Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 14 Jan 2011 14:08:24 +0000 (15:08 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 14 Jan 2011 14:08:24 +0000 (15:08 +0100)
1  2 
src/client.c

diff --cc src/client.c
Simple merge