]> granicus.if.org Git - python/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Tue, 16 Apr 2013 01:38:33 +0000 (21:38 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 16 Apr 2013 01:38:33 +0000 (21:38 -0400)
1  2 
Modules/sha1module.c

Simple merge