Benjamin Peterson 8cc7d88bbc Merged revisions 73073-73074,73089 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/trunk ........ r73073 | benjamin.peterson | 2009-05-31 09:43:00 -0500 (Sun, 31 May 2009) | 1 line remove function import ........ r73074 | benjamin.peterson | 2009-05-31 10:00:27 -0500 (Sun, 31 May 2009) | 1 line __enter__ and __exit__ must be on the class ........ r73089 | andrew.kuchling | 2009-05-31 19:14:19 -0500 (Sun, 31 May 2009) | 1 line The class for regexes isn't called RegexObject any more; correct the text ........		2009-06-01 23:14:51 +00:00
..
advocacy.rst	Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from	2008-03-16 00:07:10 +00:00
cporting.rst	Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from	2009-04-05 19:13:16 +00:00
curses.rst	Merged revisions 69998-69999,70002,70022-70023,70025-70026,70061,70086,70145,70171,70183,70188,70235,70244,70275,70281 via svnmerge from	2009-03-09 21:04:33 +00:00
doanddont.rst	Recorded merge of revisions 72830 via svnmerge from	2009-05-22 10:44:31 +00:00
functional.rst	Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from	2009-05-08 20:42:26 +00:00
index.rst	Devil merge!	2008-09-28 02:06:32 +00:00
regex.rst	Merged revisions 73073-73074,73089 via svnmerge from	2009-06-01 23:14:51 +00:00
sockets.rst	Merged revisions 68221 via svnmerge from	2009-01-03 21:26:05 +00:00
unicode.rst	Add missing documentation for bytes.decode().	2009-05-04 21:01:20 +00:00
urllib2.rst	Recorded merge of revisions 72830 via svnmerge from	2009-05-22 10:44:31 +00:00
webservers.rst	Merged revisions 69803-69805,69840,69901,69905,69907,69924,69927,69987 via svnmerge from	2009-02-26 03:38:59 +00:00