From: Éric Araujo <merwok@netwok.org>
Date: Tue, 11 Jan 2011 12:21:37 +0000 (+0000)
Subject: Synchronize maintainers file
X-Git-Tag: v3.2.1b1~347^2~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cff7e2f4a98315f9c2ec5bea9cf9ef05a2096fe9;p=thirdparty%2FPython%2Fcpython.git

Synchronize maintainers file
---

diff --git a/Misc/maintainers.rst b/Misc/maintainers.rst
index e2fb89b443d7..c3bfee4f0267 100644
--- a/Misc/maintainers.rst
+++ b/Misc/maintainers.rst
@@ -63,7 +63,7 @@ binhex
 bisect              rhettinger
 builtins
 bz2
-calendar
+calendar            rhettinger
 cgi
 cgitb
 chunk
@@ -72,7 +72,8 @@ cmd
 code
 codecs              lemburg, doerwalter
 codeop
-collections         rhettinger, stutzbach
+collections         rhettinger
+collections._abcoll rhettinger, stutzbach
 colorsys
 compileall
 configparser        lukasz.langa
@@ -81,10 +82,10 @@ copy                alexandre.vassalotti
 copyreg             alexandre.vassalotti
 cProfile
 crypt
-csv
+csv                 skip.montanaro
 ctypes              theller
 curses
-datetime            alexander.belopolsky
+datetime            belopolsky
 dbm
 decimal             facundobatista, rhettinger, mark.dickinson
 difflib             tim_one
@@ -104,7 +105,7 @@ formatter
 fpectl
 fractions           mark.dickinson, rhettinger
 ftplib              giampaolo.rodola
-functools
+functools           ncoghlan, rhettinger
 gc                  pitrou
 getopt
 getpass
@@ -125,7 +126,7 @@ importlib           brett.cannon
 inspect
 io                  pitrou, benjamin.peterson, stutzbach
 itertools           rhettinger
-json                bob.ippolito (inactive)
+json                bob.ippolito (inactive), rhettinger
 keyword
 lib2to3             benjamin.peterson
 linecache
@@ -212,18 +213,18 @@ termios
 test
 textwrap            georg.brandl
 threading           pitrou
-time                alexander.belopolsky
+time                belopolsky
 timeit              georg.brandl
 tkinter             gpolo
 token               georg.brandl
 tokenize
-trace               alexander.belopolsky
+trace               belopolsky
 traceback           georg.brandl*
 tty
 turtle              gregorlingl
 types
 unicodedata         loewis, lemburg, ezio.melotti
-unittest            michael.foord
+unittest            michael.foord, ezio.melotti
 urllib              orsenthil
 uu
 uuid
@@ -300,9 +301,9 @@ py3 transition      benjamin.peterson
 release management  tarek, lemburg, benjamin.peterson, barry, loewis,
                     gvanrossum, anthonybaxter
 str.format          eric.smith
-testing             michael.foord, pitrou, giampaolo.rodola
+testing             michael.foord, pitrou, giampaolo.rodola, ezio.melotti
 threads             pitrou
-time and dates      lemburg
+time and dates      lemburg, belopolsky
 unicode             lemburg, ezio.melotti, haypo
 version control
 ==================  ===========