Merge branch 'maint' of git://github.com/git-l10n/git-po into maint
commit62b553cdd6cd41d60b3e0c6fe4a85a951712df97
authorJunio C Hamano <gitster@pobox.com>
Sun, 28 Sep 2014 07:02:57 +0000 (28 00:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 28 Sep 2014 07:02:57 +0000 (28 00:02 -0700)
tree374a5fcb6697b87794d46ab48646cf3d451d9205
parent349cb5096397d9d1da33f2d046fa7e192e6214e7
parent061540fcf7a4dba5392462bc5b07d6c12d3afc61
Merge branch 'maint' of git://github.com/git-l10n/git-po into maint

* 'maint' of git://github.com/git-l10n/git-po:
  l10n: de.po: use comma before "um"
  l10n: de.po: change Email to E-Mail
  po/TEAMS: add new member to German translation team