]> granicus.if.org Git - python/commitdiff
#16747: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Wed, 2 Jan 2013 20:29:41 +0000 (22:29 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Wed, 2 Jan 2013 20:29:41 +0000 (22:29 +0200)
1  2 
Doc/glossary.rst

Simple merge