]> granicus.if.org Git - python/commitdiff
Merge heads
authorFlorent Xicluna <florent.xicluna@gmail.com>
Sun, 23 Oct 2011 20:47:56 +0000 (22:47 +0200)
committerFlorent Xicluna <florent.xicluna@gmail.com>
Sun, 23 Oct 2011 20:47:56 +0000 (22:47 +0200)

Trivial merge