fix merge
authorDennis Schafroth <dennis@indexdata.com>
Fri, 4 Nov 2011 12:05:30 +0000 (13:05 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 4 Nov 2011 12:05:30 +0000 (13:05 +0100)
commitc61b8edfe5b60d9394f4db7e26d6c08fec9d1452
treec663b242dc514a25b573c66d629dd88a4abd2569
parent958e55eb39d3aa82ad0188344e6154d8929a0a5d
parent672e5173cc31fc94a8f03ab97693895961c01a16
fix merge
src/client.c