Merge with stable

mercurial/commands.py

@@ -3213,7 +3213,7 b' def version_(ui):'
     ui.write(_("Mercurial Distributed SCM (version %s)\n")
              % util.version())
     ui.status(_(
-        "\nCopyright (C) 2005-2009 Matt Mackall <[e-mail]> and others\n"
+        "\nCopyright (C) 2005-2010 Matt Mackall <[e-mail]> 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"

tests/test-help.out

@@ -173,7 +173,7 b' additional help topics:'
 %% test short command list with verbose option
 Mercurial Distributed SCM (version xxx)
 
-Copyright (C) 2005-2009 Matt Mackall <[e-mail]> and others
+Copyright (C) 2005-2010 Matt Mackall <[e-mail]> 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 b' use "hg -v help add" to show global opti'
 %% test help option with version option
 Mercurial Distributed SCM (version xxx)
 
-Copyright (C) 2005-2009 Matt Mackall <[e-mail]> and others
+Copyright (C) 2005-2010 Matt Mackall <[e-mail]> 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.