Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Tue, 21 Aug 2012 13:24:57 +0000 (15:24 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 21 Aug 2012 13:24:57 +0000 (15:24 +0200)
1  2 
src/client.c

diff --cc src/client.c
Simple merge