]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Sun, 15 Dec 2013 18:12:07 +0000 (19:12 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Sun, 15 Dec 2013 18:12:07 +0000 (19:12 +0100)

Trivial merge