Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/yaz
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Nov 2015 12:54:30 +0000 (13:54 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Nov 2015 12:54:30 +0000 (13:54 +0100)

Trivial merge