Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 7 Jan 2014 12:47:46 +0000 (13:47 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 7 Jan 2014 12:47:46 +0000 (13:47 +0100)

Trivial merge