]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 23 Mar 2013 21:39:25 +0000 (23:39 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 23 Mar 2013 21:39:25 +0000 (23:39 +0200)

Trivial merge