Georg Brandl c4a55fccab Recorded merge of revisions 78024 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/trunk ........ r78024 | georg.brandl | 2010-02-06 19:44:44 +0100 (Sa, 06 Feb 2010) | 1 line #5341: fix "builtin" where used as an adjective ("built-in" is correct). ........		2010-02-06 18:46:57 +00:00
..
advocacy.rst	…
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 78024 via svnmerge from	2010-02-06 18:46:57 +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	Merged revisions 75365,75394,75402-75403,75418,75459,75484,75592-75596,75600,75602-75607,75610-75613,75616-75617,75623,75627,75640,75647,75696,75795 via svnmerge from	2009-10-27 15:28:25 +00:00
urllib2.rst	#7499: Review of Library FAQ by Florent Xicluna.	2009-12-19 17:57:51 +00:00
webservers.rst	Merged revisions 75365,75394,75402-75403,75418,75459,75484,75592-75596,75600,75602-75607,75610-75613,75616-75617,75623,75627,75640,75647,75696,75795 via svnmerge from	2009-10-27 15:28:25 +00:00