--- a/Admin/user-aliases Wed Jan 11 21:32:46 2017 +0100
+++ b/Admin/user-aliases Wed Jan 11 22:08:20 2017 +0100
@@ -1,25 +1,40 @@
+lukas.bulwahn@gmail.com = bulwahn
+chaieb@chaieb-laptop = chaieb
+eberlm@in.tum.de = eberlm
+Manuel Eberl = eberlm
+bertram.felgenhauer = felgenhauer
+bertram.felgenhauer@uibk.ac.at = felgenhauer
+Mathias.Fleury@mpi-inf.mpg.de = fleury
+Gerwin Klein <gerwin.klein@nicta.com.au> = kleing
+hellerar@macbroy24.informatik.tu-muenchen.de = hellerar
+brianh@cs.pdx.edu = huffman
+lars.hupel@mytum.de = hupel
+immler@in.tum.de = immler
+markus.kaiser@in.tum.de = kaiser
+cezarykaliszyk@gmail.com = kaliszyk
+kaliszyk@in.tum.de = kaliszyk
+gerwin.klein@nicta.com.au = kleing
+rafal.kolanski@nicta.com.au = kolanski
+lammich@in.tum.de = lammich
+Andreas Lochbihler = lochbihler
+daniel.matichuk@nicta.com.au = matichuk
+Philipp Meyer = meyerp
+nipkow@lapbroy100.local = nipkow
+noschinl@in.tum.de = noschinl
+Lars Noschinski <noschinl@in.tum.de> = noschinl
+Stephen W. Nuchia = nuchia
lcp = paulson
lp15@cam.ac.uk = paulson
+Jean Pichon = pichon
norbert.schirmer@web.de = schirmer
schirmer@in.tum.de = schirmer
-urbanc@in.tum.de = urbanc
-nipkow@lapbroy100.local = nipkow
-chaieb@chaieb-laptop = chaieb
-immler@in.tum.de = immler
-tsewell@rubicon.NSW.bigpond.net.au = tsewell
-tsewell@nicta.com.au = tsewell
+griff = sternagel
+Christian Sternagel = sternagel
+nik = sultana
+Timothy Bourke = tbourke
+rene.thiemann@uibk.ac.at = thiemann
thomas.sewell@nicta.com.au = tsewell
-kaliszyk@in.tum.de = kaliszyk
-Philipp Meyer = meyerp
-noschinl@in.tum.de = noschinl
-Lars Noschinski <noschinl@in.tum.de> = noschinl
-brianh@cs.pdx.edu = huffman
-nik = sultana
-griff = Christian Sternagel
-cezarykaliszyk@gmail.com = kaliszyk
-hellerar@macbroy24.informatik.tu-muenchen.de = hellerar
-tbourke = Timothy Bourke
-gerwin.klein@nicta.com.au = kleing
-Gerwin Klein <gerwin.klein@nicta.com.au> = kleing
-Manuel Eberl = eberlm
-Mathias.Fleury@mpi-inf.mpg.de = fleury
+tsewell@nicta.com.au = tsewell
+tsewell@rubicon.NSW.bigpond.net.au = tsewell
+urbanc@in.tum.de = urbanc
+wimmers@in.tum.de = wimmers