Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/git-tools
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 11 Apr 2011 08:56:29 +0000 (08:56 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 11 Apr 2011 08:56:29 +0000 (08:56 +0000)

Trivial merge