# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1356550540 -3600
# Node ID f716a3c58b4b04591a7dfb8fea3705b4630fac8d
# Parent  79bdd093d6babf992a42a8e6c6355e8f8d808cb1# Parent  20e14961f6307f4f6de9e579dda15554e5f13a5c
Merge 0.9->trunk

diff -r 20e14961f630 -r f716a3c58b4b prosodyctl