Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/git-tools
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 27 Jun 2012 09:25:16 +0000 (11:25 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 27 Jun 2012 09:25:16 +0000 (11:25 +0200)

Trivial merge