Merge 0.10->trunk

[prosody.git] / CHANGES

diff --git a/CHANGES b/CHANGES
index 3d277bfd56862b97001f96a246265b632f7e01c6..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
 =====================