Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 8 Sep 2014 12:33:05 +0000 (14:33 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 8 Sep 2014 12:33:05 +0000 (14:33 +0200)
1  2 
src/session.c

diff --cc src/session.c
Simple merge