Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 16 Dec 2011 12:53:55 +0000 (13:53 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 16 Dec 2011 12:53:55 +0000 (13:53 +0100)

Trivial merge