]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Nearly null-merge 2.5.6
authorMartin v. Löwis <martin@v.loewis.de>
Sat, 28 May 2011 12:14:17 +0000 (14:14 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Sat, 28 May 2011 12:14:17 +0000 (14:14 +0200)
1  2 
.hgtags

diff --cc .hgtags
Simple merge