Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Dec 2013 13:58:21 +0000 (14:58 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Dec 2013 13:58:21 +0000 (14:58 +0100)

Trivial merge