Code

Merge branch 'master-for-junio' of git://repo.or.cz/git/fastimport; branch 'maint'