Merge branch 'maint'

* maint:
  Fix generation of perl/perl.mak
  git-remote: fix "Use of uninitialized value in string ne"

diff --cc Makefile
Simple merge

diff --cc git-remote.perl
Simple merge