]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 27 Oct 2011 12:22:27 +0000 (08:22 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 27 Oct 2011 12:22:27 +0000 (08:22 -0400)
commit85c46b163561368fb16451cbaa2c899c8870d3a7
tree6d7be568381514cdfc5d21cb2318c759b0ddab25
parent0c0d7560987a4a9c7290f44f4a22806d9d04a4d5
parent87ba642ce6f325fa8e3ec3beff736cc135d9c754
merge heads