]> granicus.if.org Git - python/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 6 May 2012 13:55:17 +0000 (16:55 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 6 May 2012 13:55:17 +0000 (16:55 +0300)

Trivial merge