Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 17 Feb 2012 14:31:04 +0000 (15:31 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 17 Feb 2012 14:31:04 +0000 (15:31 +0100)

Trivial merge