]> granicus.if.org Git - python/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 28 Oct 2011 09:32:53 +0000 (12:32 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 28 Oct 2011 09:32:53 +0000 (12:32 +0300)

Trivial merge