Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt
index 58cf113a90b0ebcebb0199a1ce1780d3a17f8a22..95c5ed6016d9bfe0c2efd3e399e6270a0984149b 100644 (file)
--- a/Documentation/RelNotes-1.7.1.txt
+++ b/Documentation/RelNotes-1.7.1.txt
@@ -63,6 +63,9 @@ Updates since v1.7.0
 
  * "git imap-send" learned to support CRAM-MD5 authentication.
 
+ * "gitweb" installation procedure can use "minified" js/css files
+   better.
+
 Fixes since v1.7.0
 ------------------
 
@@ -81,5 +84,5 @@ release, unless otherwise noted.
 ---
 exec >/var/tmp/1
 echo O=$(git describe)
-O=v1.7.0.4-382-gb807c52
+O=v1.7.1-rc0-36-gb92cbb6
 git shortlog --no-merges ^maint $O..