]> granicus.if.org Git - python/commitdiff
Merge 3.3
authorÉric Araujo <merwok@netwok.org>
Sat, 3 Nov 2012 21:40:06 +0000 (17:40 -0400)
committerÉric Araujo <merwok@netwok.org>
Sat, 3 Nov 2012 21:40:06 +0000 (17:40 -0400)

Trivial merge