Lubomir Rintel authored Jun 26, 2018 and Thomas Haller committed Jun 29, 2018

This allows us to disambiguate committers. The list was compiled
manually, with preference of latter e-mail addresses if more were used
throughout the history.

(cherry picked from commit 0eafdcd5)