summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-04-22 14:04:28 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-04-22 14:04:28 (GMT)
commitc41582caa06a495bf3dcb9fdb49fd9c344939c41 (patch)
tree7e5c44e66178f461a78fcf6a1b50010711d35d24 /Misc
parentf9433fec8ba5f225cf3e423a2c0a95966e243abf (diff)
downloadcpython-c41582caa06a495bf3dcb9fdb49fd9c344939c41.zip
cpython-c41582caa06a495bf3dcb9fdb49fd9c344939c41.tar.gz
cpython-c41582caa06a495bf3dcb9fdb49fd9c344939c41.tar.bz2
Merged revisions 80327-80328 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80327 | antoine.pitrou | 2010-04-22 01:59:01 +0300 (Thu, 22 Apr 2010) | 3 lines Add myself to ssl, although I'm not a de facto maintainer or expert ........ r80328 | r.david.murray | 2010-04-22 02:05:10 +0300 (Thu, 22 Apr 2010) | 3 lines Add myself to email, move 'windows' to Platforms where it belongs, and finish alphabetizing the Platforms list. ........
Diffstat (limited to 'Misc')
-rw-r--r--Misc/maintainers.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Misc/maintainers.rst b/Misc/maintainers.rst
index 6d3b6b6..1fcdae1 100644
--- a/Misc/maintainers.rst
+++ b/Misc/maintainers.rst
@@ -88,7 +88,7 @@ dis
distutils tarek
doctest tim_one (inactive)
dummy_threading brett.cannon
-email barry
+email barry, r.david.murray
encodings lemburg, loewis
errno
exceptions
@@ -187,7 +187,7 @@ socket
socketserver
spwd
sqlite3 ghaering
-ssl janssen
+ssl janssen, pitrou
stat
string
stringprep
@@ -251,12 +251,13 @@ Platform Maintainers
AIX
Cygwin jlt63
FreeBSD
+HP-UX
Linux
Mac ronaldoussoren
NetBSD1
OS2/EMX aimacintyre
Solaris
-HP-UX
+Windows
================== ===========
@@ -291,5 +292,4 @@ threads
tracker
unicode lemburg, ezio.melotti, haypo
version control
-windows
================== ===========