]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 15 Sep 2013 00:00:42 +0000 (03:00 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 15 Sep 2013 00:00:42 +0000 (03:00 +0300)

Trivial merge