Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 23 Nov 2011 20:33:49 +0000 (21:33 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 23 Nov 2011 20:33:49 +0000 (21:33 +0100)

Trivial merge