]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Sat, 7 Dec 2013 19:28:46 +0000 (20:28 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Sat, 7 Dec 2013 19:28:46 +0000 (20:28 +0100)

Trivial merge