]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 23 Jun 2016 02:46:51 +0000 (22:46 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 23 Jun 2016 02:46:51 +0000 (22:46 -0400)
1  2 
Doc/library/importlib.rst
Doc/library/json.rst

Simple merge
Simple merge