]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 2 Aug 2011 18:06:19 +0000 (13:06 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 2 Aug 2011 18:06:19 +0000 (13:06 -0500)
commit9c46480063c7cb758525654066158f33a60b2b12
treef1396bb69cb6394445abab182f7e8169898f4639
parent7761b951db469106de297cda1aaa24a95d52d833
parente4f9e2ff2198357605e38e4e1cfade5fbe097213
merge heads