Merge git://ozlabs.org/~paulus/gitk

diff --git a/git-svn.perl b/git-svn.perl
index 36f7240c99249198512689ffecdd9c95f06b8eff..fa5f253065307499642cae63d93cdd5b5e16db0a 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1924,7 +1924,7 @@ sub load_authors {
        my $log = $cmd eq 'log';
        while (<$authors>) {
                chomp;
-               next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
+               next unless /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.*)>\s*$/;
                my ($user, $name, $email) = ($1, $2, $3);
                if ($log) {
                        $Git::SVN::Log::rusers{"$name <$email>"} = $user;