Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 26 Jun 2015 19:30:42 +0000 (21:30 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 26 Jun 2015 19:30:42 +0000 (21:30 +0200)

Trivial merge