Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 1 May 2012 10:25:29 +0000 (12:25 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 1 May 2012 10:25:29 +0000 (12:25 +0200)

Trivial merge