merge with 3.3

author Georg Brandl <georg@python.org>

Tue, 29 Oct 2013 07:17:08 +0000 (08:17 +0100)

committer Georg Brandl <georg@python.org>

Tue, 29 Oct 2013 07:17:08 +0000 (08:17 +0100)
author Georg Brandl <georg@python.org>
Tue, 29 Oct 2013 07:17:08 +0000 (08:17 +0100)
committer Georg Brandl <georg@python.org>
Tue, 29 Oct 2013 07:17:08 +0000 (08:17 +0100)
diff --cc Doc/library/datetime.rst
Simple merge
diff --cc Doc/library/nntplib.rst
Simple merge
author	Georg Brandl <georg@python.org>
	Tue, 29 Oct 2013 07:17:08 +0000 (08:17 +0100)
committer	Georg Brandl <georg@python.org>
	Tue, 29 Oct 2013 07:17:08 +0000 (08:17 +0100)
		1	2
Doc/library/datetime.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/nntplib.rst	patch \|	diff1 \|	diff2 \|	blob \| history