]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 6 Apr 2012 17:20:39 +0000 (13:20 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 6 Apr 2012 17:20:39 +0000 (13:20 -0400)
commit403bb39d1d964d7d75965649d2e8ffa1f9097b48
tree1c01fba628cbecb443e0ca86f3c47d2c9b3a1174
parentdcb89f4f09c9d0d2fcca412db726f43a0268efce
parentd3af6344ef43df20c91be8275a5e874dc0589830
merge heads