[Python-checkins] r80372 - in python/branches/release31-maint: Misc/maintainers.rst

[ezio.melotti]

Author: ezio.melotti
Date: Thu Apr 22 16:04:28 2010
New Revision: 80372

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/maintainers.rst

Modified: python/branches/release31-maint/Misc/maintainers.rst
==============================================================================
--- python/branches/release31-maint/Misc/maintainers.rst	(original)
+++ python/branches/release31-maint/Misc/maintainers.rst	Thu Apr 22 16:04:28 2010
@@ -88,7 +88,7 @@
 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 @@
 socketserver
 spwd
 sqlite3             ghaering
-ssl                 janssen
+ssl                 janssen, pitrou
 stat
 string
 stringprep
@@ -251,12 +251,13 @@
 AIX
 Cygwin              jlt63
 FreeBSD
+HP-UX
 Linux
 Mac                 ronaldoussoren
 NetBSD1
 OS2/EMX             aimacintyre
 Solaris
-HP-UX
+Windows
 ==================  ===========
 
 
@@ -291,5 +292,4 @@
 tracker
 unicode             lemburg, ezio.melotti, haypo
 version control
-windows
 ==================  ===========