Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 12 Jun 2014 17:17:45 +0000 (19:17 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 12 Jun 2014 17:17:45 +0000 (19:17 +0200)

Trivial merge