Automated merge with http://waqas.ath.cx:8000/

[prosody.git] / TODO

diff --git a/TODO b/TODO
index c127996933cb18cc049c311b0e228c08f30676bb..93096eaf894e83d11abbba8b3bfc1e263e576539 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,11 +1,8 @@
-- SASL login support
-- Roster manipulation support
 - On-the-fly code updates
-- S2S \o/
 - Control/statistics interface
-
-Further down the line:
+- External components
 - Ad-hoc commands
 - Clustering
 - Pubsub/PEP
-- Plugins!
+
+