Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Jan 2012 12:37:32 +0000 (13:37 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Jan 2012 12:37:32 +0000 (13:37 +0100)

Trivial merge