Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 23:08:58 +0000 (00:08 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 23:08:58 +0000 (00:08 +0100)
commit6a13823cd1a8cb64fd8c08c98af1f4cc4752ab9b
tree1622556d2192bd7800e294ec5c5a88e37c7e74d9
parent3601083d88db8e1b7eb87e5782466182fcdae90a
parent64a338746cdb1bc57993912003a2b57e25241dec
Merge 0.10->trunk