Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 17 Sep 2012 11:40:49 +0000 (13:40 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 17 Sep 2012 11:40:49 +0000 (13:40 +0200)

Trivial merge