Merge 0.10->trunk

[prosody.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index c6665db924601c994e893128eb469256a5794101..3ead470bdb89c8ead2aa965583932be6b9c58dc0 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,10 @@
-== Core development team ==
 
-Matthew Wild (matthew AT heavy-horse.co.uk)
-Waqas Hussain (waqas20 AT gmail.com)
-Tobias Markmann (tm AT ayena.de)
-Paul-Sebastian Manole (brokenthorn AT gmail.com)
+The Prosody project is open to contributions (see HACKERS file), but is
+maintained daily by:
+
+  - Matthew Wild (mail: matthew [at] prosody.im)
+  - Waqas Hussain (mail: waqas [at] prosody.im)
+  - Kim Alvefur (mail: zash [at] prosody.im)
+
+You can reach us collectively by email: developers [at] prosody.im
+or in realtime in the Prosody chatroom: prosody@conference.prosody.im