Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 26 Apr 2012 12:23:17 +0000 (14:23 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 26 Apr 2012 12:23:17 +0000 (14:23 +0200)
commit3c787972fe8ea6931db1ecf13783b00964f326bc
treea0a370406d32437df069b70d0887f5cbe5cdd8ea
parent699a3fdd881c07a450e89a876caa23775ebbb930
parentcb60db25764e1877e11355382cea3026171818e0
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
src/settings.h
src/http_command.c
src/pazpar2_config.c
src/settings.c
src/settings.h