Merge branch 'maint' to sync with 1.7.3.5

2011-01-05 14:50:33 -08:00 · 2011-01-05 14:50:33 -08:00 · 8594495cd6
commit 8594495cd6
parent bf9b46c16d 6e97ef31ce
1 changed files with 2 additions and 0 deletions
--- a/Documentation/RelNotes/1.7.3.5.txt
+++ b/Documentation/RelNotes/1.7.3.5.txt
@ -30,3 +30,5 @@ Git 1.7.3.5 Release Notes
 * "git rebase --skip" to skip the last commit in a series used to fail
   to run post-rewrite hook and to copy notes from old commits that have
   successfully been rebased so far.  Now it do (backmerge ef88ad2).
+
+ * "gitweb" tried to show a wrong feed logo when none was specified.