Merge 0.10->trunk

This commit is contained in:
Kim Alvefur 2017-01-23 19:34:14 +01:00
commit 468d3db1a1
14 changed files with 706 additions and 108 deletions

View file

@ -30,6 +30,7 @@ New features
- mod\_carbons (XEP-0280)
- Pluggable connection timeout handling
- mod\_websocket (RFC 7395)
- mod\_mam (XEP-0313)
Removed
-------