Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 14 Nov 2011 09:36:44 +0000 (10:36 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 14 Nov 2011 09:36:44 +0000 (10:36 +0100)

Trivial merge