]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 25 Jun 2011 17:30:52 +0000 (20:30 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 25 Jun 2011 17:30:52 +0000 (20:30 +0300)

Trivial merge