Merge branch 'maint-1.7.8' into maint

* maint-1.7.8:
  t/Makefile: Use $(sort ...) explicitly where needed
  gitweb: Fix actionless dispatch for non-existent objects
  i18n of multi-line advice messages

diff --cc builtin/revert.c
Simple merge

diff --cc gitweb/gitweb.perl
Simple merge

diff --cc t/Makefile
Simple merge

diff --cc t/t9500-gitweb-standalone-no-errors.sh
Simple merge