Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/git-tools
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 3 Jul 2012 11:51:59 +0000 (13:51 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 3 Jul 2012 11:51:59 +0000 (13:51 +0200)

Trivial merge