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)
Conflicts:
src/settings.h


No differences found