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

Trivial merge