Changeset b006464 for doc/AUTHORS

Timestamp:

2012-11-17T23:51:21Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5aa96fc8

Parents:

d1356cb (diff), e1d3f98 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline.

File:

• doc/AUTHORS (modified) (2 diffs)

doc/AUTHORS

@@ -1 @@
-Current developers:
+Core team:
 
 Wilmer van der Gaast <wilmer@gaast.net>
         Main developer
+
+
+Other contributors:
+
+Miklos Vajna <vmiklos@frugalware.org>
+        Skype module
+
+pesco <pesco@khjk.org>
+        OTR support
+
+
+Retired developers:
+
+Sjoerd 'lucumo' Hemminga <sjoerd@hemminga-online.nl>
+        NickServ, documentation
 
 Jelmer 'ctrlsoft' Vernooij <jelmer@samba.org>
@@ -10 +25 @@
         Daemon dude, plus some other stuff
 
+Geert Mulders <g.c.w.m.mulders@gmail.com>
+        Initial version of the Twitter module
 
-Retired developer:
-
-Sjoerd 'lucumo' Hemminga <sjoerd@hemminga-online.nl>
-        NickServ, documentation
-
-The development team wishes to thank Sjoerd for his contributions to the
-Bee.
+ulim <a.sporto+bee@gmail.com>
+Marijn Kruisselbrink
+        File transfer support