]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 3.4
authorÉric Araujo <merwok@netwok.org>
Mon, 17 Mar 2014 20:50:35 +0000 (16:50 -0400)
committerÉric Araujo <merwok@netwok.org>
Mon, 17 Mar 2014 20:50:35 +0000 (16:50 -0400)

Trivial merge