# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1458234524 -3600
# Node ID 389697309f592a85eb8bfdcdbee0771af5a84df3
# Parent  30b9433a9f3e46d9e87f54a250c093df6aa0759c# Parent  867f107409d9d3e3f2c175c7d420a91451e553e0
Merge 0.10->trunk

diff -r 30b9433a9f3e -r 389697309f59 CHANGES