]> granicus.if.org Git - python/commit
projects / python / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b1aef23 4804991)
Merge from 3.1.
authorÉric Araujo <merwok@netwok.org>
Wed, 23 Mar 2011 02:43:22 +0000 (03:43 +0100)
committerÉric Araujo <merwok@netwok.org>
Wed, 23 Mar 2011 02:43:22 +0000 (03:43 +0100)
commitbbcfc1f2d926c1198b4c23a6e5640e3f3aee9d98
treeb895d09843982ea12c860d25507619ef1ec615f4tree | snapshot
parentb1aef23316b093e042bc6afa7e52cd9d7c95802ccommit | diff
parent48049911d6ff4f3caebc09a28c0a94e0c7ad8842commit | diff
Merge from 3.1.

The fix was already committed to 3.2, but I merged two small changes
recommended by Raymond while I was working on the 2.7 patch to ease
future merges.
Objects/setobject.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.