Merge 0.10->trunk

author: Kim Alvefur <zash@zash.se>
date: Wed, 10 Aug 2016 17:00:10 +0200
parent: 7548:69d8e1477c43
child: 7607:d17bc0d0748e
--- a/configure	Wed Aug 10 16:57:16 2016 +0200
+++ b/configure	Wed Aug 10 17:00:10 2016 +0200
@@ -15,7 +15,6 @@
 ICU_FLAGS="-licui18n -licudata -licuuc"
 OPENSSL_LIB=crypto
 CC=gcc
-CXX=g++
 LD=gcc
 RUNWITH=lua
 EXCERTS=yes
@@ -385,7 +384,6 @@
 CFLAGS=$CFLAGS
 LDFLAGS=$LDFLAGS
 CC=$CC
-CXX=$CXX
 LD=$LD
 RUNWITH=$RUNWITH
 EXCERTS=$EXCERTS