]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0047cc 1d52096)
Merge issue #22295 fix from 3.4
authorNick Coghlan <ncoghlan@gmail.com>
Sat, 6 Sep 2014 10:40:00 +0000 (20:40 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Sat, 6 Sep 2014 10:40:00 +0000 (20:40 +1000)
1  2 
Doc/glossary.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/glossary.rst
Simple merge
Mirror of https://github.com/python/cpython.git