# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1404482077 -7200
# Node ID 6ddd7913913bfeb5ffdeaef7b532ebc12a48447f
# Parent  66fb7b7c668dbf4fccda0a1d26a5a66fadc9b2c6# Parent  5b298a6ecf0c0fd2721f05279cea59edac982f03
Merge 0.9->0.10