Merge remote-tracking branch 'upstream/master' into cluster

diff --git a/.mailmap b/.mailmap
new file mode 100644 (file)
index 0000000..c6eb36e
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,11 @@
+<xsdg@xsdg.org> <xsdg@google.com>
+<cclark@mcb.net> <colin.clark@cclark.uk>
+Colin Clark <cclark@mcb.net>
+<johne@verizon.net> John Ellis <gqview@users.sf.net>
+<zas@norz.org> Laurent Monin <geeqie@norz.org>
+<mschwendt@fedoraproject.org> <mschwendt@gmail.com>
+<michal@cihar.com> <mcihar@suse.cz>
+<michal@cihar.com> <nijel@debian.org>
+<jrs+git@weitnahbei.de> J. R. Schmid <sixtyfive@users.noreply.github.com>
+Morgan Hardwood <entertheyoni@gmail.com>
+Rezső Páder <rezso@rezso.net>