Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 14 Oct 2013 13:12:39 +0000 (15:12 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 14 Oct 2013 13:12:39 +0000 (15:12 +0200)

Trivial merge