summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-08-04 10:27:17 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-08-04 10:27:17 (GMT)
commitbe766ad2672b06ba3c0d857c605a0bc4c8c3b7b0 (patch)
tree92011d2ad0534e07b59d3597ad4f3e27152e40e9
parent8c5ced43a127592585fede62f68edb4886804202 (diff)
downloadcpython-be766ad2672b06ba3c0d857c605a0bc4c8c3b7b0.zip
cpython-be766ad2672b06ba3c0d857c605a0bc4c8c3b7b0.tar.gz
cpython-be766ad2672b06ba3c0d857c605a0bc4c8c3b7b0.tar.bz2
Merged revisions 83709 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83709 | antoine.pitrou | 2010-08-04 12:26:30 +0200 (mer., 04 août 2010) | 3 lines Something fun to maintain ........
-rw-r--r--Misc/maintainers.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/maintainers.rst b/Misc/maintainers.rst
index 8fda2d0..fd6d99a 100644
--- a/Misc/maintainers.rst
+++ b/Misc/maintainers.rst
@@ -224,7 +224,7 @@ uu
uuid
warnings brett.cannon
wave
-weakref fdrake
+weakref fdrake, pitrou
webbrowser georg.brandl
winreg
winsound effbot (inactive)