]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5edbaf2 eff61f6)
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Thu, 1 Sep 2011 20:33:56 +0000 (16:33 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 1 Sep 2011 20:33:56 +0000 (16:33 -0400)
1  2 
Objects/object.c patch | diff1 | diff2 | blob | history

diff --cc Objects/object.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.