]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 20 Jun 2011 00:48:38 +0000 (19:48 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 20 Jun 2011 00:48:38 +0000 (19:48 -0500)
commit4092e68396e861ca57f1a5761e8a60d5ce300877
tree9b23bac0df174fafc0206ae2ac589f1e90949fa9
parentf5ff22329b3a4838054dfadfad74fc5a0519cbb2
parentbd4c321a3f7664e22ead9ea8ec55c10c10583905
merge heads