]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Sun, 25 Aug 2013 16:29:16 +0000 (18:29 +0200)
committerCharles-François Natali <cf.natali@gmail.com>
Sun, 25 Aug 2013 16:29:16 +0000 (18:29 +0200)

Trivial merge