Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint

[git/mingw.git] / templates / this--description

Unnamed repository; edit this file 'description' to name the repository.