Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/git-tools
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 4 Apr 2012 12:22:14 +0000 (14:22 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 4 Apr 2012 12:22:14 +0000 (14:22 +0200)

Trivial merge