]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 16 Mar 2012 15:13:30 +0000 (10:13 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 16 Mar 2012 15:13:30 +0000 (10:13 -0500)
commit49f0b70906d0a42c274cb3957ab58bd85e5f4898
tree0c8c2122ff46469075ddb7b3a3a3ac9af2d0abb1
parent2dbda07a1736270717ec194b90b11c7bf71b606c
parentc105cf5affafb3c6c0ca4f84f932d3d048068bfc
merge heads