Merge 0.10->trunk

[prosody.git] / CHANGES

diff --git a/CHANGES b/CHANGES
index c7add4d3fb991576a718e8bfce655c95e494dfbc..499f36dd1e594e1fe9297154ec29ff7ba281a3c5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,17 @@
+trunk
+=====
+
+**YYYY-MM-DD**
+
+New features
+------------
+
+-   Rewritten more extensible MUC module
+    -   Store inactive rooms to disk
+    -   Store rooms to disk on shutdown
+-   mod\_pep\_plus
+-   Asynchronous operations
+
 0.10.not-released-yet
 =====================
 
@@ -14,8 +28,8 @@ New features
 -   Lua 5.2 support
 -   mod\_blocklist (XEP-0191)
 -   mod\_carbons (XEP-0280)
--   Asynchronous operations
 -   Pluggable connection timeout handling
+-   mod\_websocket (RFC 7395)
 
 Removed
 -------