Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/git-tools
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 18 Jun 2013 11:48:18 +0000 (13:48 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 18 Jun 2013 11:48:18 +0000 (13:48 +0200)

Trivial merge