]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorSandro Tosi <sandro.tosi@gmail.com>
Tue, 28 Feb 2012 21:29:08 +0000 (22:29 +0100)
committerSandro Tosi <sandro.tosi@gmail.com>
Tue, 28 Feb 2012 21:29:08 +0000 (22:29 +0100)

Trivial merge