[SQUASH???] minimum fix-ups

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'tz/credential-authinfo' into pu

* tz/credential-authinfo:
  [SQUASH???] minimum fix-ups
  Add contrib/credentials/netrc with GPG support