Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/git-tools
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 18 Sep 2012 10:31:45 +0000 (10:31 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 18 Sep 2012 10:31:45 +0000 (10:31 +0000)

Trivial merge