Index: svnadmin/conf/access
===================================================================
--- svnadmin/conf/access	(revision 312954)
+++ svnadmin/conf/access	(revision 312955)
@@ -1,243 +1,238 @@
 # $FreeBSD$
 #
 # Please try to keep the handbook (contrib/chapter.sgml authors.ent
 # staff/chapter.sgml) in sync with this.
 #
 #	KEEP ALPHABETICALLY SORTED!!!
 #	KEEP ALPHABETICALLY SORTED!!!
 #	KEEP ALPHABETICALLY SORTED!!!
 #	KEEP ALPHABETICALLY SORTED!!!
 #
 # When adding a new committer to this file, please make sure to
 # include the following information in the commit message:
 #   (1) Who the commit bit was approved by ("Approved by: core").
 #   (2) The full name of the person.
 #   (3) In brief, what they will be working on (a couple of sentences).
 #
 # Changes to email forwards can be made without core's approval.  Please
 # use "Approved by: core (implicit)" to that type of commits.
 #
 ache
 achim
 adrian
 ae
 agc
 akiyama
 allanjude
 alc
 alfred
 ambrisko
 andre
 andreast
 andrew
 anish
 antoine
 araujo
 arybchik
 asomers
 avatar
 avg
 avos
 badger
 bapt
 bde
 bdrewery
-benl
 benno
 bms
 br
 brooks
 brueffer
 bryanv
 bz
 cem
 charnier
 cherry
 cognet
 cperciva
 cracauer
 csjp
 cy
 dab
 das
 davidch
 davidcs
 dchagin
 def
 deischen
 delphij
 des
 dexuan
 dfr
 dim
 dteske
 dumbbell
 dwmalone	dwmalone=freebsd-committers@maths.tcd.ie
 eadler
 ed
 edavis
 emaste
 emax
 eri
 erj
 fabient
 fanf
 fjoe
 gabor
 gad
 gallatin
 ganbold
 gavin
 gibbs
 gjb
 glebius
 gnn
 gonzo
 grehan
 grog
 gshapiro	freebsd-cvs-committers@g.gshapiro.net
 harti
 hiren
 hrs
 hselasky
 ian
 imp
 ivadasz
 iwasaki
 jah
 jamie
 jasone
 jceel
 jch
 jchandra
 jeff
-jhay
 jhb
 jhibbits
 jilles
 jimharris
 jkh
 jkim
 jlh
 jmallett
 jmcneill
 jmg
 jmmv
 joerg	freebsd-devel@uriah.heep.sax.de
 jonathan
 jpaetzel
 jtl
 julian
 jwd
 kadesai
 kaiw
 kan
 karels
 ken
 kevlo
 kib
 kp
 kuriyama
 landonf
 lidl
 loos
 lstewart
 luigi
 mahrens
 manu
 marcel
 marius
 markj
 markm
 mav
 maxim
 mckusick
 melifaro
 mizhka
 mjg
 mm
 mmel
 monthadar
 mp
 mr
 n_hibma	devnull
 neel
 netchild
 ngie
 np
 nwhitehorn
 nyan
 obrien
 oleg
 oshogbo
 peter	peter@wemm.org
 peterj
 pfg
 phil
 philip
 phk
 pho
 pjd
 pkelsey
 pluknet
 ps
 pstef
 qingli
-raj
 ray
 remko
 rmacklem
 rnoland
 roberto
 rodrigc
 royger
 rpaulo
 rpokala
 rrs
 rstone
 ru
 rwatson bb+lists.freebsd.cvs-committers@cyrus.watson.org
 sanpei
 sbruno
 scf
 schweikh
 scottl
 se
 sephe
 sgalabov
 silby
 simon
 sjg
 skra
 slm
 smh
 sobomax
 stas
 stefanf
 stevek
 syrinx
 syuu
 takawata
 theraven
 thomas
 thompsa
 tijl
 torek
 trasz
 truckman
 tsoome
 tuexen
 tychon
 ume
-ups	ups_old@stups.com
 uqs
 vangyzen
 venkat
 whu
 will
-wkoszek
 wma
 wollman
 yongari
 zbb
 zec
Index: svnadmin/conf/mentors
===================================================================
--- svnadmin/conf/mentors	(revision 312954)
+++ svnadmin/conf/mentors	(revision 312955)
@@ -1,41 +1,40 @@
 # $FreeBSD$
 
 # A list of current mentee login names and their mentors.  This list is not 
 # used for anything, but serves as a place to commit to in order to
 # "release" a mentee from mentorship since svn cannot do forced commits.
 
 # The full list of mentor->mentee relationships including historical
 # entries is in head/share/misc/committers-src.dot
 
 # Sort by mentee login name.
 
 # Mentee	Mentor		Optional comment
 achim		scottl		Co-mentor: emaste
 anish		neel		Co-mentor: grehan
 agc		scottl		Co-mentor: emax
 badger		kib		Co-mentor: vangyzen
-benl		philip		Co-mentor: simon
 carl		jimharris
 cherry		gibbs
 dab		vangyzen
 def		pjd
 dexuan		sephe
 eri		gnn		Co-mentor: thompsa
 ivadasz		adrian		Co-mentor: cognet
 jceel		trasz
 jkh		rwatson
 jwd		rmacklem
 kadesai		ken		Co-mentor: scottl, ambrisko
 karels		gnn
 mahrens		mckusick
 miwi		rwatson
 monthadar	adrian
 peterj		jhb		Co-mentor: grog
 phil		theraven	Co-mentor: sjg
 pstef		pfg
 slm		ken		Co-mentor: scottl, ambrisko
 snb		dwmalone
 stevek		sjg
 torek		rpaulo
 tsoome		allanjude	Co-mentor: imp
 venkat		delphij		Co-mentor: luigi, jhb