Merge branch 'maint'

gitster · gitster · commit fc364c767a82 · 2012-10-12T11:36:06.000-07:00
* maint:
  gitweb.cgi: fix "comitter_tz" typo in feed
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -8028,7 +8028,7 @@ sub git_feed {
 		%latest_commit = %{$commitlist[0]};
 		my $latest_epoch = $latest_commit{'committer_epoch'};
 		exit_if_unmodified_since($latest_epoch);
-		%latest_date = parse_date($latest_epoch, $latest_commit{'comitter_tz'});
+		%latest_date = parse_date($latest_epoch, $latest_commit{'committer_tz'});
 	}
 	print $cgi->header(
 		-type => $content_type,

Original file line number	Diff line number	Diff line change
`@@ -8028,7 +8028,7 @@ sub git_feed {`
`8028`	`8028`	`%latest_commit = %{$commitlist[0]};`
`8029`	`8029`	`my $latest_epoch = $latest_commit{'committer_epoch'};`
`8030`	`8030`	`exit_if_unmodified_since($latest_epoch);`
`8031`		`- %latest_date = parse_date($latest_epoch, $latest_commit{'comitter_tz'});`
	`8031`	`+ %latest_date = parse_date($latest_epoch, $latest_commit{'committer_tz'});`
`8032`	`8032`	`}`
`8033`	`8033`	`print $cgi->header(`
`8034`	`8034`	`-type => $content_type,`