Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Sep 2014 07:39:27 +0000 (09:39 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Sep 2014 07:39:27 +0000 (09:39 +0200)
1  2 
src/session.c

diff --cc src/session.c
Simple merge