Merge 0.9->trunk

author: Matthew Wild <mwild1@gmail.com>
date: Wed, 03 Apr 2013 13:53:21 +0100
parent: 5403:d7ecf6cd584e
--- a/AUTHORS	Sun Mar 31 13:21:19 2013 +0100
+++ b/AUTHORS	Wed Apr 03 13:53:21 2013 +0100
@@ -1,4 +1,10 @@
-== Core development team ==
+
+The Prosody project is open to contributions (see HACKERS file), but is
+maintained daily by:
 
-Matthew Wild (matthew.wild AT heavy-horse.co.uk)
-Waqas Hussain (waqas20 AT gmail.com)
+  - 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