]> granicus.if.org Git - python/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 26 Oct 2012 16:35:00 +0000 (19:35 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 26 Oct 2012 16:35:00 +0000 (19:35 +0300)

Trivial merge