]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Null merge from 3.4 backport
authorNick Coghlan <ncoghlan@gmail.com>
Sat, 6 Sep 2014 09:44:41 +0000 (19:44 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Sat, 6 Sep 2014 09:44:41 +0000 (19:44 +1000)

Trivial merge