# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266519475 0
# Node ID ef33efdec5bb15070dcda2553bc748d25fd2960e
# Parent  6877179335a9e47a1e6bd5a8fc8925f89297a7a3# Parent  c26bfc0359bb81ca72ed0ce1a6d2097b09771acf
Merge with 0.7

diff -r 6877179335a9 -r ef33efdec5bb HACKERS
--- a/HACKERS	Thu Feb 18 16:46:07 2010 +0000
+++ b/HACKERS	Thu Feb 18 18:57:55 2010 +0000
@@ -5,6 +5,8 @@
 information on these at http://prosody.im/discuss
 
 Patches are welcome, though before sending we would appreciate if you read 
-docs/coding_style.txt for guidelines on how to format your code, and are 
-comfortable with copyright of contributions being assigned to the core 
-developers.
+docs/coding_style.txt for guidelines on how to format your code, and other tips.
+
+Documentation for developers can be found at http://prosody.im/doc/developers
+
+Have fun :)
diff -r 6877179335a9 -r ef33efdec5bb README
--- a/README	Thu Feb 18 16:46:07 2010 +0000
+++ b/README	Thu Feb 18 18:57:55 2010 +0000
@@ -32,6 +32,6 @@
 ## Installation
 
 See the accompanying INSTALL file for help on building Prosody from source. Alternatively 
-see our guide at http://prosody.im/install
+see our guide at http://prosody.im/doc/install
 
 
diff -r 6877179335a9 -r ef33efdec5bb TODO
--- a/TODO	Thu Feb 18 16:46:07 2010 +0000
+++ b/TODO	Thu Feb 18 18:57:55 2010 +0000
@@ -1,5 +1,16 @@
-- Ad-hoc commands
-- Clustering
+== 0.8 ==
+- Ad-hoc commands:
+	http://code.google.com/p/prosody-modules/wiki/mod_adhoc
+	http://code.google.com/p/prosody-modules/wiki/mod_adhoc_cmd_admin
+	http://code.google.com/p/prosody-modules/wiki/mod_adhoc_cmd_ping
+	http://code.google.com/p/prosody-modules/wiki/mod_adhoc_cmd_uptime
+	
 - Pubsub
+- Data storage backend abstraction
 
+== 0.9 ==
+- Clustering
 
+== 1.0 ==
+- Web interface?
+- World domination