Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 20 Nov 2012 12:18:59 +0000 (13:18 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 20 Nov 2012 12:18:59 +0000 (13:18 +0100)

Trivial merge