Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 7 Aug 2012 11:41:43 +0000 (13:41 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 7 Aug 2012 11:41:43 +0000 (13:41 +0200)

Trivial merge