Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 18 Dec 2013 09:11:47 +0000 (10:11 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 18 Dec 2013 09:11:47 +0000 (10:11 +0100)

Trivial merge