Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 13 Aug 2014 11:48:48 +0000 (13:48 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 13 Aug 2014 11:48:48 +0000 (13:48 +0200)

Trivial merge