Merge branch 'master' into bytarget_block
authorDennis Schafroth <dennis@indexdata.com>
Fri, 4 Nov 2011 12:56:14 +0000 (13:56 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 4 Nov 2011 12:56:14 +0000 (13:56 +0100)
1  2 
src/client.c

diff --cc src/client.c
Simple merge