Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 17 May 2013 12:43:17 +0000 (14:43 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 17 May 2013 12:43:17 +0000 (14:43 +0200)

Trivial merge