Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/yaz
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 9 Dec 2014 12:36:21 +0000 (13:36 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 9 Dec 2014 12:36:21 +0000 (13:36 +0100)

Trivial merge