]> 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: 0ab5cf9 1dd75a6)
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Mon, 25 Jun 2012 16:09:07 +0000 (18:09 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Mon, 25 Jun 2012 16:09:07 +0000 (18:09 +0200)

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