Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/git-tools
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 4 Feb 2013 10:09:37 +0000 (10:09 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 4 Feb 2013 10:09:37 +0000 (10:09 +0000)

Trivial merge