]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 27 Jun 2011 14:16:23 +0000 (09:16 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 27 Jun 2011 14:16:23 +0000 (09:16 -0500)
commit4a5d599b3663e20fafd7f710d6e8e794701d7842
tree872c1fd99eb70904649ef1fa42507cfebaf70fd9
parent7e6b3aac856f92b155daddd8607eb128ce4e33b8
parent2bd9100b2aa3d49f72e2020ecaa6105ef0a065c5
merge heads