Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 15 Dec 2011 09:21:28 +0000 (10:21 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 15 Dec 2011 09:21:28 +0000 (10:21 +0100)

Trivial merge