]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #22006: Merge from 3.4.
authorMark Dickinson <dickinsm@gmail.com>
Sat, 19 Jul 2014 20:45:24 +0000 (21:45 +0100)
committerMark Dickinson <dickinsm@gmail.com>
Sat, 19 Jul 2014 20:45:24 +0000 (21:45 +0100)

Trivial merge