- merged changes from PLD, all TLD changes and fixes are kept

[rc-scripts.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index af351add9786ad341b94e717af1b4785d0b78d1b..252e6a03cfaf61ef1d7627cbddc55c1bb1da2678 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,12 @@
 MAINTAINERS
 
-Maintainer of development version
-is Marcin Krol <hawk@tld-linux.org>
-
 AUTHORS/CREDITS
 
-Arkadiusz Miśkiewicz <misiek@pld-linux.org>
+Marcin Krol <hawk@tld-linux.org>
+       fixes, scripts for controlling bonding,
+       preparation for TLD Linux
+
+Arkadiusz Miśkiewicz <arekm@pld-linux.org>
        networking functions, iproute2 support,
        national language support, scripts for
        controling tunnels and bridges
@@ -16,6 +17,9 @@ Artur Frysiak <wiget@pld-linux.org>
 Bartosz Waszak <waszi@pld-linux.org>
        fixes, devfsd support
 
+Elan Ruusamäe <glen@pld-linux.org>
+       fixes and features
+
 Grzegorz Stanislawski <stangrze@open.net.pl>
        ppp scripts, prefix/netmask converting
        functions, bug fixes