diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2012-11-17 23:51:21 +0000 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2012-11-17 23:51:21 +0000 |
commit | b0064647d06d4169f2b49f4f527ce05af43aacff (patch) | |
tree | d1d1c7a5bd947cdb9e1931b79fa5b71c65e33cd8 /doc/AUTHORS | |
parent | d1356cb8b0f964ddf7de50e1ba52eecc271e470a (diff) | |
parent | e1d3f986ddad6140a25f3feffc9e28da8fc2318d (diff) |
Merge mainline.
Diffstat (limited to 'doc/AUTHORS')
-rw-r--r-- | doc/AUTHORS | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/doc/AUTHORS b/doc/AUTHORS index 6dab1040..3cc01570 100644 --- a/doc/AUTHORS +++ b/doc/AUTHORS @@ -1,19 +1,32 @@ -Current developers: +Core team: Wilmer van der Gaast <wilmer@gaast.net> Main developer -Jelmer 'ctrlsoft' Vernooij <jelmer@samba.org> - Documentation, general hacking, Win32 port -Maurits Dijkstra <mauritsd@xs4all.nl> - Daemon dude, plus some other stuff +Other contributors: +Miklos Vajna <vmiklos@frugalware.org> + Skype module -Retired developer: +pesco <pesco@khjk.org> + OTR support + + +Retired developers: Sjoerd 'lucumo' Hemminga <sjoerd@hemminga-online.nl> NickServ, documentation -The development team wishes to thank Sjoerd for his contributions to the -Bee. +Jelmer 'ctrlsoft' Vernooij <jelmer@samba.org> + Documentation, general hacking, Win32 port + +Maurits Dijkstra <mauritsd@xs4all.nl> + Daemon dude, plus some other stuff + +Geert Mulders <g.c.w.m.mulders@gmail.com> + Initial version of the Twitter module + +ulim <a.sporto+bee@gmail.com> +Marijn Kruisselbrink + File transfer support |