Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 8 Mar 2013 12:46:53 +0000 (13:46 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 8 Mar 2013 12:46:53 +0000 (13:46 +0100)
1  2 
src/client.c
src/http_command.c
src/session.c

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