From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 4 Apr 2013 20:03:50 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v1.8.3-rc0~115
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/bfd70c53b38f03a4e788fb84518c09f67b7514c2?hp=8d994db46ecd3efa1adbd401f8969f8de25fbb20

Sync with maint

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

diff --git a/.mailmap b/.mailmap
index c7e8618300..48d7acf013 100644
--- a/.mailmap
+++ b/.mailmap
@@ -73,6 +73,7 @@ Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 <nico@fluxnic.net> <nico@cam.org>
 Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
 Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
+Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
 Philippe Bruhat <book@cpan.org>
 Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
diff --git a/contrib/mw-to-git/git-remote-mediawiki.txt b/contrib/mw-to-git/git-remote-mediawiki.txt
index 4d211f5b81..23b7ef9f62 100644
--- a/contrib/mw-to-git/git-remote-mediawiki.txt
+++ b/contrib/mw-to-git/git-remote-mediawiki.txt
@@ -4,4 +4,4 @@ objects from mediawiki just as one would do with a classic git
 repository thanks to remote-helpers.
 
 For more information, visit the wiki at
-https://github.com/Bibzball/Git-Mediawiki/wiki
+https://github.com/moy/Git-Mediawiki/wiki