Merge from 2.6.

b946b865 · Guido van Rossum · eb450dbd · 235e9136 · b946b865
Commit b946b865 authored Mar 19, 2011 by Guido van Rossum
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

README README +2 -1

No files found.
--- a/README
+++ b/README
 This is Python version 2.7.1
 ============================

-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Python Software Foundation.  All rights reserved.
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Python Software Foundation.  All rights reserved.

 Copyright (c) 2000 BeOpen.com.
 All rights reserved.