Merge branch 'master' into gl/web

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 0ae18103c1cba74a7278de1b24b8052467be882b..e00a6ed6e0689efe0405041040e9a852bbeb7020 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2291,7 +2291,7 @@ sub git_blame {
                chomp $line;
                $line_class_num = ($line_class_num + 1) % $line_class_len;
 
-               if ($line =~ m/^([0-9a-fA-F]{40})\t\(\s*([^\t]+)\t(\d+) \+\d\d\d\d\t(\d+)\)(.*)$/) {
+               if ($line =~ m/^([0-9a-fA-F]{40})\t\(\s*([^\t]+)\t(\d+) [+-]\d\d\d\d\t(\d+)\)(.*)$/) {
                        $long_rev = $1;
                        $author   = $2;
                        $time     = $3;