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