]> granicus.if.org Git - python/commitdiff
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

Simple merge