# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1441323137 18000
# Node ID 7187f6e923d55cf6b7e6910d24645f303db671ee
# Parent  bb6936bec727955aeeff8063a72c694c1733e604# Parent  0dda3692ec9b6b9e220ad7afa1434b553f8f62c0
merge with stable

diff -r bb6936bec727 -r 7187f6e923d5 mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py	Wed Sep 02 16:07:35 2015 -0400
+++ b/mercurial/hgweb/hgweb_mod.py	Thu Sep 03 18:32:17 2015 -0500
@@ -201,11 +201,13 @@
 
     def refresh(self):
         repostate = []
+        mtime = 0
         # file of interrests mtime and size
         for meth, fname in foi:
             prefix = getattr(self.repo, meth)
             st = get_stat(prefix, fname)
             repostate.append((st.st_mtime, st.st_size))
+            mtime = max(mtime, st.st_mtime)
         repostate = tuple(repostate)
         # we need to compare file size in addition to mtime to catch
         # changes made less than a second ago
@@ -215,7 +217,7 @@
             # update these last to avoid threads seeing empty settings
             self.repostate = repostate
             # mtime is needed for ETag
-            self.mtime = st.st_mtime
+            self.mtime = mtime
 
     def run(self):
         """Start a server from CGI environment.
diff -r bb6936bec727 -r 7187f6e923d5 mercurial/templates/monoblue/help.tmpl
--- a/mercurial/templates/monoblue/help.tmpl	Wed Sep 02 16:07:35 2015 -0400
+++ b/mercurial/templates/monoblue/help.tmpl	Thu Sep 03 18:32:17 2015 -0500
@@ -30,7 +30,7 @@
         </ul>
     </div>
 
-    <h2 class="no-link no-border">branches</h2>
+    <h2 class="no-link no-border">help</h2>
     <div id="doc">
     {rstdoc(doc, "html")}
     </div>
diff -r bb6936bec727 -r 7187f6e923d5 mercurial/templates/monoblue/helptopics.tmpl
--- a/mercurial/templates/monoblue/helptopics.tmpl	Wed Sep 02 16:07:35 2015 -0400
+++ b/mercurial/templates/monoblue/helptopics.tmpl	Thu Sep 03 18:32:17 2015 -0500
@@ -30,7 +30,7 @@
         </ul>
     </div>
 
-    <h2 class="no-link no-border">branches</h2>
+    <h2 class="no-link no-border">help</h2>
     <table cellspacing="0">
     <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
     {topics % helpentry}