Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 1 Jun 2012 07:04:01 +0000 (09:04 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 1 Jun 2012 07:04:01 +0000 (09:04 +0200)

Trivial merge