Merge branch 'master' into bug_4688
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 4 Nov 2011 13:34:58 +0000 (14:34 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 4 Nov 2011 13:34:58 +0000 (14:34 +0100)
1  2 
src/session.c
src/session.h

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