]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 23 Nov 2013 20:45:06 +0000 (22:45 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 23 Nov 2013 20:45:06 +0000 (22:45 +0200)

Trivial merge