Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 5 Sep 2014 10:14:52 +0000 (12:14 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 5 Sep 2014 10:14:52 +0000 (12:14 +0200)

Trivial merge