Merge 3.1

author Éric Araujo <merwok@netwok.org>

Wed, 27 Apr 2011 14:27:38 +0000 (16:27 +0200)

committer Éric Araujo <merwok@netwok.org>

Wed, 27 Apr 2011 14:27:38 +0000 (16:27 +0200)
author Éric Araujo <merwok@netwok.org>
Wed, 27 Apr 2011 14:27:38 +0000 (16:27 +0200)
committer Éric Araujo <merwok@netwok.org>
Wed, 27 Apr 2011 14:27:38 +0000 (16:27 +0200)
diff --cc Doc/library/__future__.rst
Simple merge
diff --cc Doc/library/sys.rst
Simple merge
diff --cc Doc/library/wsgiref.rst
Simple merge
author	Éric Araujo <merwok@netwok.org>
	Wed, 27 Apr 2011 14:27:38 +0000 (16:27 +0200)
committer	Éric Araujo <merwok@netwok.org>
	Wed, 27 Apr 2011 14:27:38 +0000 (16:27 +0200)
		1	2
Doc/library/__future__.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/sys.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/wsgiref.rst	patch \|	diff1 \|	diff2 \|	blob \| history