Sync with maint
commitbfd70c53b38f03a4e788fb84518c09f67b7514c2
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Apr 2013 20:03:50 +0000 (4 13:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Apr 2013 20:03:50 +0000 (4 13:03 -0700)
tree4f48f0541e7a2d1ce50263e78cc5479ce52a1553
parent8d994db46ecd3efa1adbd401f8969f8de25fbb20
parent3a3101c62ecfbde184934f590bab5d84d7ae64a0
Sync with maint

* maint:
  mailmap: update Pasky's address
  git-remote-mediawiki: new wiki URL in documentation