# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1262563878 -3600
# Node ID f5e55f1ca92738458295ca9f82f31c54a89babbb
# Parent  45885e8f5704c1b85eb43681b4ae9d0be97c29d6# Parent  8b5ca9b9b435380ee3dde45eadb61cefa10a13f2
Merge with stable

diff -r 45885e8f5704 -r f5e55f1ca927 mercurial/commands.py
--- a/mercurial/commands.py	Sun Jan 03 19:13:55 2010 +0100
+++ b/mercurial/commands.py	Mon Jan 04 01:11:18 2010 +0100
@@ -3213,7 +3213,7 @@
     ui.write(_("Mercurial Distributed SCM (version %s)\n")
              % util.version())
     ui.status(_(
-        "\nCopyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
+        "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
         "This is free software; see the source for copying conditions. "
         "There is NO\nwarranty; "
         "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff -r 45885e8f5704 -r f5e55f1ca927 tests/test-help.out
--- a/tests/test-help.out	Sun Jan 03 19:13:55 2010 +0100
+++ b/tests/test-help.out	Mon Jan 04 01:11:18 2010 +0100
@@ -173,7 +173,7 @@
 %% test short command list with verbose option
 Mercurial Distributed SCM (version xxx)
 
-Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others
+Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -253,7 +253,7 @@
 %% test help option with version option
 Mercurial Distributed SCM (version xxx)
 
-Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others
+Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.