From 0b4cee420f842f8593c147b05b91ff3c37db58b7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 1 Oct 2015 18:25:46 +0200
Subject: [PATCH] Merge same authors and regenerate authors.

---
 README.asciidoc             | 3 +--
 scripts/dev/src2asciidoc.py | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.asciidoc b/README.asciidoc
index 7f602a976..ddbab3bf1 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -147,12 +147,12 @@ Contributors, sorted by the number of commits in descending order:
 * Artur Shaik
 * Daniel
 * Thorsten Wißmann
+* Alexey "Averrin" Nabrodov
 * ZDarian
 * Peter Vilim
 * John ShaggyTwoDope Jenkins
 * Jimmy
 * Zach-Button
-* Alexey Nabrodov
 * rikn00
 * Patric Schmitz
 * Martin Zimmermann
@@ -179,7 +179,6 @@ Contributors, sorted by the number of commits in descending order:
 * HalosGhost
 * Gregor Pohl
 * Eivind Uggedal
-* Averrin
 * Arseniy Seroka
 * Andy Balaam
 * Andreas Fischer
diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py
index d24c12d7d..3b3124d41 100755
--- a/scripts/dev/src2asciidoc.py
+++ b/scripts/dev/src2asciidoc.py
@@ -385,7 +385,11 @@ def generate_settings(filename):
 
 def _get_authors():
     """Get a list of authors based on git commit logs."""
-    corrections = {'binix': 'sbinix'}
+    corrections = {
+        'binix': 'sbinix',
+        'Averrin': 'Alexey "Averrin" Nabrodov',
+        'Alexey Nabrodov': 'Alexey "Averrin" Nabrodov',
+    }
     commits = subprocess.check_output(['git', 'log', '--format=%aN'])
     authors = [corrections.get(author, author)
                for author in commits.decode('utf-8').splitlines()]