Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 28 Feb 2011 11:40:27 +0000 (12:40 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 28 Feb 2011 11:40:27 +0000 (12:40 +0100)

Trivial merge