]> granicus.if.org Git - python/commit
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)
commit97054cf0b5b5a41ba07474e247057b808236845b
tree3a215086f26acf1e54ea774d003bc02937cd3e78
parentc09fca67e7babfda22964143c74dcd313470850a
parentbbcfc1f2d926c1198b4c23a6e5640e3f3aee9d98
Merge from 3.2.

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.