Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10

Junio C Hamano committed Sep 22, 2017 at 14:34 UTC 985f59c042320ddf0a506e553d5eef9689ef4c32

No changes.