Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Sun, 8 Sep 2013 06:49:39 +0000 (08:49 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Sun, 8 Sep 2013 06:49:39 +0000 (08:49 +0200)

Trivial merge