]> granicus.if.org Git - python/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Thu, 8 Nov 2012 08:11:22 +0000 (10:11 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Thu, 8 Nov 2012 08:11:22 +0000 (10:11 +0200)

Trivial merge