Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/git-tools
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Jul 2013 12:52:50 +0000 (12:52 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Jul 2013 12:52:50 +0000 (12:52 +0000)

Trivial merge