]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 23 Jun 2013 17:25:40 +0000 (20:25 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 23 Jun 2013 17:25:40 +0000 (20:25 +0300)

Trivial merge