Merge branch 'maint'

* maint:
  gitweb: use decode_utf8 directly
  posix compatibility for t4200
  Document 'opendiff' value in config.txt and git-mergetool.txt
  Allow PERL_PATH="/usr/bin/env perl"
  Make xstrndup common
  diff.c: fix "size cache" handling.
  http-fetch: Disable use of curl multi support for libcurl < 7.16.

diff --cc Documentation/config.txt
Simple merge

diff --cc commit.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc gitweb/gitweb.perl
index cbd8d03,12c2e66..ba5cc43
--- 1/gitweb/gitweb.perl
--- 2/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -1126,11 -1098,9 +1120,11 @@@ sub git_get_projects_list 
                        if (check_export_ok("$projectroot/$path")) {
                                my $pr = {
                                        path => $path,
-                                       owner => to_utf8($owner),
+                                       owner => decode_utf8($owner),
                                };
 -                              push @list, $pr
 +                              push @list, $pr;
 +                              (my $forks_path = $path) =~ s/\.git$//;
 +                              $paths{$forks_path}++;
                        }
                }
                close $fd;