]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Tue, 15 Apr 2014 16:01:57 +0000 (12:01 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Tue, 15 Apr 2014 16:01:57 +0000 (12:01 -0400)

Trivial merge