Merge 0.10->trunk

[prosody.git] / CHANGES

diff --git a/CHANGES b/CHANGES
index c7add4d3fb991576a718e8bfce655c95e494dfbc..2e0e61a20d12396721023872cba910d804553a38 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+trunk
+=====
+
+**YYYY-MM-DD**
+
+New features
+------------
+
+-   Rewritten more extensible MUC module
+-   mod\_pep\_plus
+
 0.10.not-released-yet
 =====================
 
@@ -16,6 +27,7 @@ New features
 -   mod\_carbons (XEP-0280)
 -   Asynchronous operations
 -   Pluggable connection timeout handling
+-   mod\_websocket (RFC 7395)
 
 Removed
 -------