Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 13 Nov 2013 12:50:17 +0000 (13:50 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 13 Nov 2013 12:50:17 +0000 (13:50 +0100)

Trivial merge