]> granicus.if.org Git - python/commit
merge heads
authorMartin v. Löwis <martin@v.loewis.de>
Fri, 18 May 2012 12:24:09 +0000 (14:24 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Fri, 18 May 2012 12:24:09 +0000 (14:24 +0200)
commit0d635aef92758ae7502a5dccf449b8597ce36ba6
treef12fd6192670b9fa3ad2438ffdaa9b7e8c9e7985
parentf7a661571945b02e4c3aa77f30a86a3244cb5d2b
parente9dfb0f8229e6477f2d22753252dfb78fd3e25d3
merge heads