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

diff --cc src/session.c
Simple merge
diff --cc win/makefile
Simple merge