Merge branch 'master' of github.com:mdp-toolkit/mdp-toolkit

* 'master' of github.com:mdp-toolkit/mdp-toolkit: OTH: add .mailmap to fix git-shortlog
mdp-toolkit · Dec 9, 2011 · b07e297 · b07e297
2 parents 140e1e5 + f5a8d39
commit b07e297
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,3 @@
+Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+Pietro Berkes <berkes@berkestop.(none)>
+Michael Schmuker <m.schmuker@fu-berlin.de>