Merge 0.10->trunk

author: Kim Alvefur <zash@zash.se>
date: Thu, 28 Jan 2016 15:11:33 +0100
parent: 7109:f3b172874922
child: 7111:43328166dcf1
child: 7112:bd29742fa1ba
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CHANGES	Thu Jan 28 15:11:33 2016 +0100
@@ -0,0 +1,24 @@
+0.10.not-released-yet
+=====================
+
+**YYYY-MM-DD**
+
+New features
+------------
+
+-   Rewritten SQL storage module with Archive support
+-   SCRAM-SHA-1-PLUS
+-   `prosodyctl check`
+-   Statistics
+-   Improved TLS configuration
+-   Lua 5.2 support
+-   mod\_blocklist (XEP-0191)
+-   mod\_carbons (XEP-0280)
+-   Asynchronous operations
+-   Pluggable connection timeout handling
+
+Removed
+-------
+
+-   mod\_privacy (XEP-0016)
+