Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 9 Sep 2014 10:41:15 +0000 (12:41 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 9 Sep 2014 10:41:15 +0000 (12:41 +0200)
1  2 
src/session.c

diff --cc src/session.c
Simple merge