]> granicus.if.org Git - python/commit
merge heads
authorMartin v. Löwis <martin@v.loewis.de>
Mon, 9 Jul 2012 18:51:45 +0000 (20:51 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Mon, 9 Jul 2012 18:51:45 +0000 (20:51 +0200)
commitb7439a547b5d21bb32693eece2a8307d6221282e
treef7b3e7eb70731a3ecbf29d2d0d46654c41a10eae
parent5c453ce3a4152f04d6be06c539102fd7185180cc
parent79007fa05d1a4bb0553244b362f2ca378e0b331a
merge heads