]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f5a163 1303298)
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 15 Feb 2012 21:31:23 +0000 (22:31 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 15 Feb 2012 21:31:23 +0000 (22:31 +0100)

Trivial merge
Mirror of https://github.com/python/cpython.git