# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1356077094 -3600
# Node ID 79bdd093d6babf992a42a8e6c6355e8f8d808cb1
# Parent  80cb521507734437b0ac565b5346f7df0fe523f0# Parent  b125892e187c7de6ca35868a78b468b49a0da360
Merge 0.9->trunk

diff -r b125892e187c -r 79bdd093d6ba prosodyctl