Merge 0.10->trunk

[prosody.git] / TODO

diff --git a/TODO b/TODO
index ed349dadfa48f58f20288c69dab5382cae37129c..d22d20f4a7078d0a4868a8932d3b4007a7c70fc0 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,8 +1,5 @@
-- SASL login support
-- Roster manipulation support
-- S2S \o/
-
-Further down the line:
+== 1.0 ==
+- Roster providers
+- Statistics
 - Clustering
-- Pubsub/PEP
-- Plugins!
+- World domination