Merge branch 'feature/mailmap-timok' into 'master'

[mailmap] Add second mail address for Timo Koch

See merge request !2407

.mailmap

@@ -89,3 +89,5 @@ Theresa Kurz <theresa.kurz@iws.uni-stuttgart.de> <tkurz@kiddo.iws.uni-stuttgart.
 Theresa Kurz <theresa.kurz@iws.uni-stuttgart.de> tkurz <theresa.kurz@iws.uni-stuttgart.de>
 
 Vishal Jambhekar <vishal.jambhekar@iws.uni-stuttgart.de>
+
+Timo Koch <timokoch@uio.no> <timo.koch@iws.uni-stuttgart.de>