Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 17 Apr 2015 12:08:51 +0000 (14:08 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 17 Apr 2015 12:08:51 +0000 (14:08 +0200)

Trivial merge