Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/git-tools
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 7 Jun 2012 13:45:13 +0000 (15:45 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 7 Jun 2012 13:45:13 +0000 (15:45 +0200)

Trivial merge