131 files changed, 3311 insertions, 1202 deletions

diff --git a/.mailmap b/.mailmap
index 6303782106..bcf4f8770f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@ David Kågedal <davidk@lysator.liu.se>