Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 10:20:02 +0000 (11:20 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 10:20:02 +0000 (11:20 +0100)
1  2 
src/session.c

diff --cc src/session.c
Simple merge