Merge 0.10->trunk

This commit is contained in:
Kim Alvefur 2016-01-30 14:18:42 +01:00
commit bebb4e7b67

View file

@ -27,6 +27,7 @@ New features
- mod\_carbons (XEP-0280)
- Asynchronous operations
- Pluggable connection timeout handling
- mod\_websocket (RFC 7395)
Removed
-------