Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 23 Apr 2012 14:45:15 +0000 (16:45 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 23 Apr 2012 14:45:15 +0000 (16:45 +0200)

Trivial merge