Merge branch 'blog' of repo.or.cz:/srv/git/git/dscho into blog