]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 12 Apr 2013 13:23:24 +0000 (16:23 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 12 Apr 2013 13:23:24 +0000 (16:23 +0300)

Trivial merge