Merge branch 'master' into pgp

2015-04-11 21:43:54 +01:00
parent 5305a3e3a6 f18759192c
commit 3597a89233
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@@ -4,6 +4,7 @@
 - GNU Readline
 - Message Carbons (xep-0280)
 - Message Delivery Receipts (xep-0184)
+- MUC Mediated Invitation support

 0.4.6
 =====