]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 23 Feb 2012 20:20:08 +0000 (15:20 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 23 Feb 2012 20:20:08 +0000 (15:20 -0500)
commit03d23687480c77130e7fc28f323ec75413e6f060
tree41b2050b9f2d2f865991ec6117e411f92768b060
parentd8f4118f9b554a0c2110fb9d3f33fa5fa0a6c488
parent16f6a29be8fe709c133f07150c1326451139faae
merge heads