Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/git-tools
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 30 Apr 2012 19:19:13 +0000 (21:19 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 30 Apr 2012 19:19:13 +0000 (21:19 +0200)

Trivial merge