Merge branch 'new-mail' of github.com:git-l10n-pt-PT/git-po