Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 28 Sep 2014 07:03:25 +0000 (00:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 28 Sep 2014 07:03:25 +0000 (00:03 -0700)
* 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

Trivial merge