]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 23 Apr 2012 17:50:05 +0000 (13:50 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 23 Apr 2012 17:50:05 +0000 (13:50 -0400)
commit9bc36530831b3b59b68b0579aeb01cd27ea36c20
tree44bbc2caba84e803133e097cfb517d93e6bba2a7
parentdb780d0d13976b099b22bc5145a53ec3ff6c63ba
parent8c52ab597f6f3fc17bdcd157ed53c88e016ae2bb
merge heads