Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 12 Aug 2013 10:48:19 +0000 (12:48 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 12 Aug 2013 10:48:19 +0000 (12:48 +0200)

Trivial merge