Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Mon, 7 Nov 2011 09:23:54 +0000 (10:23 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 7 Nov 2011 09:23:54 +0000 (10:23 +0100)
1  2 
src/http_command.c
src/session.h

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