Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Apr 2013 15:02:01 +0000 (17:02 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Apr 2013 15:02:01 +0000 (17:02 +0200)
1  2 
src/client.c

diff --cc src/client.c
Simple merge