]> 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: 4164ac1 c5d47d5)
Merge with 3.2
authorKristján Valur Jónsson <kristjan@ccpgames.com>
Fri, 23 Mar 2012 12:52:11 +0000 (12:52 +0000)
committerKristján Valur Jónsson <kristjan@ccpgames.com>
Fri, 23 Mar 2012 12:52:11 +0000 (12:52 +0000)

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