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)
1  2 
src/client.c
src/client.h

diff --cc src/client.c
Simple merge
diff --cc src/client.h
Simple merge