]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 10 Nov 2013 19:05:38 +0000 (21:05 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 10 Nov 2013 19:05:38 +0000 (21:05 +0200)

Trivial merge