Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 26 Apr 2015 22:03:14 +0000 (00:03 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 26 Apr 2015 22:03:14 +0000 (00:03 +0200)
commit13aa0e4ea3289b9d9980301b74c90163599c5ae8
tree28d015744bb9eaae7dfe2ce79762cc1e0d687ac2
parent5fc589b5a2e0226b2ec6e70c4a1ba19bf17016e8
parent98fab38517c38647948d332cfe964326a1bef072
Merge 0.10->trunk