From: Georg Brandl <georg@python.org>
Date: Wed, 6 Oct 2010 09:36:50 +0000 (+0000)
Subject: Merged revisions 82830-82831,83767,83982,84000,84005-84007,84105,84260,84534 via... 
X-Git-Tag: v2.7.1rc1~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4058911365137bbfc50e1303df0b01bd59677253;p=python

Merged revisions 82830-82831,83767,83982,84000,84005-84007,84105,84260,84534 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82830 | brian.curtin | 2010-07-12 01:32:11 +0200 (Mo, 12 Jul 2010) | 2 lines

  Put my name down for winreg.
........
  r82831 | martin.v.loewis | 2010-07-12 08:03:18 +0200 (Mo, 12 Jul 2010) | 2 lines

  Remove myself.
........
  r83767 | r.david.murray | 2010-08-06 23:18:49 +0200 (Fr, 06 Aug 2010) | 4 lines

  Add xml subpackages, since they are likely to have different maintainers.

  And if not they can be merged back together when that becomes apparent.
........
  r83982 | r.david.murray | 2010-08-13 20:16:35 +0200 (Fr, 13 Aug 2010) | 4 lines

  Per request, make 'nosy' vs 'assign' explicit in maintainers.rst.

  Also add myself as assignable for email issues.
........
  r84000 | eric.araujo | 2010-08-14 06:56:48 +0200 (Sa, 14 Aug 2010) | 2 lines

  Let's commit
........
  r84005 | ezio.melotti | 2010-08-14 10:54:33 +0200 (Sa, 14 Aug 2010) | 1 line

  Revert r82831 as discussed at EP now that the wording of maintainers.rst has been clarified.
........
  r84006 | ezio.melotti | 2010-08-14 11:02:36 +0200 (Sa, 14 Aug 2010) | 1 line

  Add myself for the bug tracker (and for re).
........
  r84007 | antoine.pitrou | 2010-08-14 14:06:40 +0200 (Sa, 14 Aug 2010) | 3 lines

  Add myself to threads topic (suggested by Ezio)
........
  r84105 | tim.golden | 2010-08-16 22:10:39 +0200 (Mo, 16 Aug 2010) | 1 line

  Add Tim Golden as interested in Windows
........
  r84260 | vinay.sajip | 2010-08-22 20:41:24 +0200 (So, 22 Aug 2010) | 1 line

  Updated maintainers.rst to reflect correct Roundup name.
........
  r84534 | eric.araujo | 2010-09-05 20:21:46 +0200 (So, 05 Sep 2010) | 2 lines

  Fix amk’s tracker name
........
---

diff --git a/Misc/maintainers.rst b/Misc/maintainers.rst
index ddcda2cc2b..222cd49bc9 100644
--- a/Misc/maintainers.rst
+++ b/Misc/maintainers.rst
@@ -237,7 +237,7 @@ warnings            brett.cannon
 wave
 weakref             fdrake, pitrou
 webbrowser          georg.brandl
-winreg              brian.curtin*, stutzbach
+_winreg             brian.curtin*, stutzbach
 winsound            effbot (inactive)
 wsgiref             pje
 xdrlib