]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 12 Jan 2012 20:26:20 +0000 (15:26 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 12 Jan 2012 20:26:20 +0000 (15:26 -0500)
commit1adbc6f56a7c08b06b42d8eddc5fd76cfa5815c7
tree41779130dc01520c3b2043711c81f6ad46f8c791
parent0c91392fe6eca0c4b45913645f046536d0f53d19
parentdc41e3f23feafcf81b1c6a2d612e2fcc0ef6b63a
merge heads