]> granicus.if.org Git - python/commit
merge heads
authorMatthias Klose <doko@ubuntu.com>
Wed, 14 Mar 2012 22:24:11 +0000 (23:24 +0100)
committerMatthias Klose <doko@ubuntu.com>
Wed, 14 Mar 2012 22:24:11 +0000 (23:24 +0100)
commit20b303ed85162c99577375558a6a1b310e00f3fa
treee4da866a41fd0c40f8633f77406d151ab5272b37
parent1be7cd0a7860851bdf4079d58583cc1a66c9ae63
parent0f4c16e29cd7925bd99cb68dba5595eed6e19b62
merge heads