]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c09fca6 bbcfc1f)
Merge from 3.2.
authorÉric Araujo <merwok@netwok.org>
Wed, 23 Mar 2011 03:40:51 +0000 (04:40 +0100)
committerÉric Araujo <merwok@netwok.org>
Wed, 23 Mar 2011 03:40:51 +0000 (04:40 +0100)
The fix was already present in 3.3, but I merged two small changes
recommended by Raymond while I was working on the 2.7 patch to ease
future merges.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.