]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 11 Nov 2012 18:40:38 +0000 (19:40 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 11 Nov 2012 18:40:38 +0000 (19:40 +0100)

Trivial merge