From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 22 Apr 2010 14:04:28 +0000 (+0000)
Subject: Merged revisions 80327-80328 via svnmerge from
X-Git-Tag: v3.1.3rc1~888
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c41582caa06a495bf3dcb9fdb49fd9c344939c41;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Misc/maintainers.rst b/Misc/maintainers.rst
index 6d3b6b6456bf..1fcdae179084 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
 ==================  ===========