Merge branch 'master' into bug_4688
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 3 Nov 2011 12:51:20 +0000 (13:51 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 3 Nov 2011 12:51:20 +0000 (13:51 +0100)
commit158c725b0201be796e73338f8c8b529379912ad6
treeb06cfa5094789da846c15c105eae3069a6e00dc1
parent619158657579a473f5152948ac6b7e0595c0bd80
parent34d3a2921d43eb3e73e305753ff97521b2806c7d
Merge branch 'master' into bug_4688
src/client.c
src/client.h