Merge 0.10->trunk

author: Kim Alvefur <zash@zash.se>
date: Mon, 23 Jan 2017 19:34:14 +0100
parent: 7822:4caaa0c185f1
parent: 7853:8c3de36568dd
child: 8290:1ebe590c8849
--- a/CHANGES	Fri Jan 13 18:30:18 2017 +0100
+++ b/CHANGES	Mon Jan 23 19:34:14 2017 +0100
@@ -30,6 +30,7 @@
 -   mod\_carbons (XEP-0280)
 -   Pluggable connection timeout handling
 -   mod\_websocket (RFC 7395)
+-   mod\_mam (XEP-0313)
 
 Removed
 -------