Merge 0.11->trunk

author: Kim Alvefur <zash@zash.se>
date: Sun, 28 Oct 2018 17:17:07 +0100
parent: 9583:4552ba1333ac
child: 9588:6a3f06a5dff9
--- a/CHANGES	Thu Oct 25 15:12:59 2018 +0200
+++ b/CHANGES	Sun Oct 28 17:17:07 2018 +0100
@@ -1,7 +1,7 @@
-trunk
-=====
+0.11.0
+======
 
-**YYYY-MM-DD**
+**YYYY-MM-DD** (not yet)
 
 New features
 ------------