Merge branch 'master' into bug_4688
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 8 Nov 2011 11:09:13 +0000 (12:09 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 8 Nov 2011 11:09:13 +0000 (12:09 +0100)
commita76aa7a25380bb9947d8dfed2aca94832f47d564
treef6c07fc44d496e910ff0d04a19f3ce0ad656e93c
parent942a772d08b2e0eb14ad66549daa08bbb0c1fe94
parent540f17b0ff1440f461bb9e99429e6157eb689968
Merge branch 'master' into bug_4688
src/client.c
src/session.h