Update .mailmap

Update Ian Jackson's email address as requested in
<https://lists.debian.org/debian-dpkg/2015/09/msg00015.html>.

Reverse Michael Vogt @ubuntu.com local part mapping, following the form
in the most recent commits.

Other updates taken from dpkg's mailmap file.

1 files changed, 18 insertions, 8 deletions

diff --git a/.mailmap b/.mailmap
index c66db1ded..8f1b6f2e3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,18 +1,28 @@
-# Unify user identities
-Christian Perrier <bubulle@debian.org>
-<ian@davenant.greenend.org.uk> <ian@anarres>
-<ian@davenant.greenend.org.uk> <ian@liberator>
+# Aliases
+<mvo@ubuntu.com> <michael.vogt@ubuntu.com>
+
+# Use real mail addresses
+<ijackson@chiark.greenend.org.uk> <ian@anarres>
+<ijackson@chiark.greenend.org.uk> <ian@liberator>
 <jackyf@debian.org> <jackyf@1501-debian>
 Michael Vogt <mvo@debian.org> <egon@debian-vm>
 <mvo@debian.org> <egon@bottom>
 <mvo@debian.org> <egon@debian-devbox>
 <mvo@debian.org> <egon@pop>
 <mvo@debian.org> <egon@tas>
-<michael.vogt@ubuntu.com> <mvo@ubuntu.com>
-# Name changes
-Peter Krefting <peterk@debian.org>
-# Email as user name
+
+# Very broken names
 Christian Perrier <bubulle@debian.org> bubulle@debian.org <>
 Julian Andres Klode <jak@debian.org> jak@debian.org <>
 Loïc Minier <lool@dooz.org> lool@dooz.org <>
 Martin Pitt <martin@piware.de> martin@piware.de <>
+
+# Spell names properly
+Christian Perrier <bubulle@debian.org>
+Joe Hansen <joedalton2@yahoo.dk>
+Johannes Schauer Marin Rodrigues <j.schauer@email.de>
+Johannes Schauer Marin Rodrigues <josch@debian.org>
+Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
+Michael Vogt <mvo@debian.org>
+Peter Krefting <peterk@debian.org>
+Trần Ngọc Quân <vnwildman@gmail.com>