Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Wed, 30 Mar 2011 13:40:36 +0000 (15:40 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 30 Mar 2011 13:40:36 +0000 (15:40 +0200)
1  2 
src/http_command.c
src/session.c

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