# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1365453807 -7200
# Node ID 16493e410fa847fcbb1b1a6a9e9d5e7e37fb4d3a
# Parent  116971a751d3ade3a977c74815cc94fc7f560e60# Parent  5f69fddf6fb94606e46792457d21382b7b129a9d
Merge 0.9->trunk

diff -r 5f69fddf6fb9 -r 16493e410fa8 prosodyctl