Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Apr 2013 20:03:50 +0000 (13:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Apr 2013 20:03:50 +0000 (13:03 -0700)
* maint:
mailmap: update Pasky's address
git-remote-mediawiki: new wiki URL in documentation

Trivial merge