]> granicus.if.org Git - python/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Thu, 20 Oct 2011 16:45:39 +0000 (19:45 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Thu, 20 Oct 2011 16:45:39 +0000 (19:45 +0300)

Trivial merge