granicus.if.org Git - python/commit

]> granicus.if.org Git - python/commit

projects / python / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: be095b3 cd2a603)

author	Éric Araujo <merwok@netwok.org>
	Sun, 5 Feb 2012 12:49:59 +0000 (13:49 +0100)
committer	Éric Araujo <merwok@netwok.org>
	Sun, 5 Feb 2012 12:49:59 +0000 (13:49 +0100)
commit	cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2
tree	3e40b36621bfc2f4140b612d8a6d2ed01d1f9e39	tree \| snapshot
parent	be095b3b9857a5b949dd23b89dac5f5151b252d5	commit \| diff
parent	cd2a6033ac0bafd69a7cba2d132e092127acc895	commit \| diff

Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715)

Doc/distutils/apiref.rst	diff1 \|	diff2 \|	blob \| history
Doc/library/archiving.rst	diff1 \|	diff2 \|	blob \| history
Doc/library/bz2.rst	diff1 \|	diff2 \|	blob \| history
Doc/library/gzip.rst	diff1 \|	diff2 \|	blob \| history
Doc/library/shutil.rst	diff1 \|	diff2 \|	blob \| history
Doc/library/tarfile.rst	diff1 \|	diff2 \|	blob \| history
Doc/library/zlib.rst	diff1 \|	diff2 \|	blob \| history
Lib/distutils/tests/test_bdist_rpm.py	diff1 \|	diff2 \|	blob \| history
Lib/shutil.py	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.