]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorRichard Oudkerk <shibturn@gmail.com>
Sat, 18 May 2013 17:13:16 +0000 (18:13 +0100)
committerRichard Oudkerk <shibturn@gmail.com>
Sat, 18 May 2013 17:13:16 +0000 (18:13 +0100)

Trivial merge