Merge 0.10->trunk

[prosody.git] / TODO

diff --git a/TODO b/TODO
index 93096eaf894e83d11abbba8b3bfc1e263e576539..d22d20f4a7078d0a4868a8932d3b4007a7c70fc0 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,8 +1,5 @@
-- On-the-fly code updates
-- Control/statistics interface
-- External components
-- Ad-hoc commands
+== 1.0 ==
+- Roster providers
+- Statistics
 - Clustering
-- Pubsub/PEP
-
-
+- World domination