Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 18 Sep 2012 13:08:22 +0000 (15:08 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 18 Sep 2012 13:08:22 +0000 (15:08 +0200)

Trivial merge