]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 3 Feb 2014 18:42:43 +0000 (20:42 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 3 Feb 2014 18:42:43 +0000 (20:42 +0200)

Trivial merge