# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1264262146 -3600
# Node ID 6134adc1c431b67d9192c00f2842cc04dfffc337
# Parent  6109a02c682b1750a5f5673719dccb5131208ffc# Parent  17c6d5eab25d57e5efcea66a1ed8c66471b1de56
Merge with stable

diff -r 6109a02c682b -r 6134adc1c431 mercurial/templates/coal/map
--- a/mercurial/templates/coal/map	Fri Jan 22 17:15:58 2010 +0100
+++ b/mercurial/templates/coal/map	Sat Jan 23 16:55:46 2010 +0100
@@ -181,7 +181,7 @@
     <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td>
     <td>{description}</td>
     <td>{contact|obfuscate}</td>
-    <td class="age">{lastchange|age} ago</td>
+    <td class="age">{lastchange|age}</td>
     <td class="indexlinks">{archives%indexarchiveentry}</td>
   </tr>\n'
 indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">&nbsp;&darr;{type|escape}</a>'
diff -r 6109a02c682b -r 6134adc1c431 mercurial/templates/gitweb/graph.tmpl
--- a/mercurial/templates/gitweb/graph.tmpl	Fri Jan 22 17:15:58 2010 +0100
+++ b/mercurial/templates/gitweb/graph.tmpl	Sat Jan 23 16:55:46 2010 +0100
@@ -63,7 +63,7 @@
 var revlink = '<li style="_STYLE"><span class="desc">';
 revlink += '<a class="list" href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID"><b>_DESC</b></a>';
 revlink += '</span> _TAGS';
-revlink += '<span class="info">_DATE ago, by _USER</span></li>';
+revlink += '<span class="info">_DATE, by _USER</span></li>';
 
 graph.vertex = function(x, y, color, parity, cur) {
 	
diff -r 6109a02c682b -r 6134adc1c431 mercurial/templates/monoblue/graph.tmpl
--- a/mercurial/templates/monoblue/graph.tmpl	Fri Jan 22 17:15:58 2010 +0100
+++ b/mercurial/templates/monoblue/graph.tmpl	Sat Jan 23 16:55:46 2010 +0100
@@ -60,7 +60,7 @@
 
     var revlink = '<li style="_STYLE"><span class="desc">';
     revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
-    revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>';
+    revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';
 
     graph.vertex = function(x, y, color, parity, cur) {
 
diff -r 6109a02c682b -r 6134adc1c431 mercurial/templates/paper/graph.tmpl
--- a/mercurial/templates/paper/graph.tmpl	Fri Jan 22 17:15:58 2010 +0100
+++ b/mercurial/templates/paper/graph.tmpl	Sat Jan 23 16:55:46 2010 +0100
@@ -71,7 +71,7 @@
 
 var revlink = '<li style="_STYLE"><span class="desc">';
 revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
-revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>';
+revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';
 
 graph.vertex = function(x, y, color, parity, cur) {
 	
diff -r 6109a02c682b -r 6134adc1c431 mercurial/templates/spartan/graph.tmpl
--- a/mercurial/templates/spartan/graph.tmpl	Fri Jan 22 17:15:58 2010 +0100
+++ b/mercurial/templates/spartan/graph.tmpl	Sat Jan 23 16:55:46 2010 +0100
@@ -55,7 +55,7 @@
 
 var revlink = '<li style="_STYLE"><span class="desc">';
 revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
-revlink += '</span><span class="info">_DATE ago, by _USER</span></li>';
+revlink += '</span><span class="info">_DATE, by _USER</span></li>';
 
 graph.vertex = function(x, y, color, parity, cur) {
 	
diff -r 6109a02c682b -r 6134adc1c431 mercurial/templates/spartan/map
--- a/mercurial/templates/spartan/map	Fri Jan 22 17:15:58 2010 +0100
+++ b/mercurial/templates/spartan/map	Sat Jan 23 16:55:46 2010 +0100
@@ -168,7 +168,7 @@
     <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td>
     <td>{description}</td>
     <td>{contact|obfuscate}</td>
-    <td class="age">{lastchange|age} ago</td>
+    <td class="age">{lastchange|age}</td>
     <td class="indexlinks">
       <a href="{url}rss-log">RSS</a>
       <a href="{url}atom-log">Atom</a>
diff -r 6109a02c682b -r 6134adc1c431 tests/test-hgweb-commands.out
--- a/tests/test-hgweb-commands.out	Fri Jan 22 17:15:58 2010 +0100
+++ b/tests/test-hgweb-commands.out	Sat Jan 23 16:55:46 2010 +0100
@@ -775,7 +775,7 @@
 var revlink = '<li style="_STYLE"><span class="desc">';
 revlink += '<a class="list" href="/rev/_NODEID?style=gitweb" title="_NODEID"><b>_DESC</b></a>';
 revlink += '</span> _TAGS';
-revlink += '<span class="info">_DATE ago, by _USER</span></li>';
+revlink += '<span class="info">_DATE, by _USER</span></li>';
 
 graph.vertex = function(x, y, color, parity, cur) {
 	
diff -r 6109a02c682b -r 6134adc1c431 tests/test-hgweb-empty.out
--- a/tests/test-hgweb-empty.out	Fri Jan 22 17:15:58 2010 +0100
+++ b/tests/test-hgweb-empty.out	Sat Jan 23 16:55:46 2010 +0100
@@ -235,7 +235,7 @@
 
 var revlink = '<li style="_STYLE"><span class="desc">';
 revlink += '<a href="/rev/_NODEID" title="_NODEID">_DESC</a>';
-revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>';
+revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';
 
 graph.vertex = function(x, y, color, parity, cur) {