]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 16 Mar 2012 23:22:53 +0000 (18:22 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 16 Mar 2012 23:22:53 +0000 (18:22 -0500)
1  2 
Lib/functools.py

Simple merge