diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
| commit | 729ffbae086309992d7433a296fca64f6800f8fa (patch) | |
| tree | 6c133d2b91ab9313da11bf8bad15f497e1b5c61f /MAINTAINERS | |
| parent | 88ad1a936ccd2451d6dbf542a0a746ad71a3e968 (diff) | |
| parent | fc7050e54c69919d754ca0adf3f2f741a501fec4 (diff) | |
| download | samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.gz samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.bz2 samba-729ffbae086309992d7433a296fca64f6800f8fa.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Conflicts:
source4/main.mk
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2b09221efc..f6824a1181 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -26,8 +26,8 @@ libmsrpc Chris Nichols <skel@samba.org> libsmbclient Derrell Lipman <derrell@samba.org> -pdb_*sql Wilco Baan Hofman <synnack@users.sf.net> - Florian Effenberger <floeff@users.sf.net> +pdb_*sql Collen Blijenberg <collen@hermanjordan.nl> + Herwin Weststrate <herwin@snt.utwente.nl> http://pdbsql.sourceforge.net/ |