Merge branch 'master' into protocol-version2
authorDennis Schafroth <dennis@indexdata.com>
Tue, 15 May 2012 10:46:59 +0000 (12:46 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 15 May 2012 10:46:59 +0000 (12:46 +0200)
1  2 
src/session.c

diff --cc src/session.c
Simple merge