# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1353816766 -3600
# Node ID a971bee1a5f5f3355de9a2f9e440ec43e5a29190
# Parent  99cb5170a2ea8eaa7ac6f08aa71bfdaf5187bb15# Parent  ff0d0cd07c438671957405c00758111b82259c14
Merge 0.9->trunk

diff -r ff0d0cd07c43 -r a971bee1a5f5 prosodyctl