]> granicus.if.org Git - python/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 3 Nov 2012 19:18:57 +0000 (21:18 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 3 Nov 2012 19:18:57 +0000 (21:18 +0200)

Trivial merge