]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 23 May 2011 21:29:50 +0000 (16:29 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 23 May 2011 21:29:50 +0000 (16:29 -0500)
commit200fe3d747fe8da9a5043632dad435b33c492439
tree484d738b47a7cb9e7dafcf065668357ef5558c7a
parentf5fcd33be9b21b148774d3fa2832bb0627e94809
parenta2a895c46c8e838a29308dd0da7ab1d364ff4495
merge heads