Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 4 Nov 2014 10:22:44 +0000 (11:22 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 4 Nov 2014 10:22:44 +0000 (11:22 +0100)

Trivial merge