Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 13 Mar 2013 13:03:55 +0000 (14:03 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 13 Mar 2013 13:03:55 +0000 (14:03 +0100)
1  2 
src/session.c

diff --cc src/session.c
Simple merge