]> granicus.if.org Git - python/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 24 Jun 2012 20:04:02 +0000 (22:04 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 24 Jun 2012 20:04:02 +0000 (22:04 +0200)

Trivial merge