Merge branch 'maint'

* maint: l10n: de.po: use comma before "um" l10n: de.po: change Email to E-Mail po/TEAMS: add new member to German translation team
git-mirror · Sep 28, 2014 · a9583af · a9583af
2 parents d29e9c8 + 62b553c
commit a9583af
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 50 deletions.
diff --git a/po/TEAMS b/po/TEAMS
@@ -17,6 +17,7 @@ Members:	Thomas Rast <tr@thomasrast.ch>
 		Christian Stimming <stimming@tuhh.de>
 		Phillip Szelat <phillip.szelat@gmail.com>
 		Matthias Rüster <matthias.ruester@gmail.com>
+		Magnus Görlitz <magnus.goerlitz@googlemail.com>
 
 Language:	fr (French)
 Repository:	https://github.com/jnavila/git