Merge 0.11->trunk

author: Matthew Wild <mwild1@gmail.com>
date: Tue, 30 Oct 2018 13:59:53 +0000
parent: 9589:aeb054ee88c5
child: 9638:83f3a05c1b1b
--- a/CHANGES	Mon Oct 29 02:13:09 2018 +0100
+++ b/CHANGES	Tue Oct 30 13:59:53 2018 +0000
@@ -22,6 +22,7 @@
 -   mod\_muc\_mam (XEP-0313 in groupchats)
 -   mod\_vcard\_legacy (XEP-0398)
 -   mod\_vcard4 (XEP-0292)
+-   mod\_csi, mod\_csi\_simple (XEP-0352)
 -   New experimental network backend "epoll"
 
 0.10.0