# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1366240252 -3600
# Node ID 421c7830eccc2137c77b8e5d510443007081d924
# Parent  ed10252ee9c393dafde46d59d8e3fbffc3159edf# Parent  0880a079d83058143fe0e01d547dbebb04c2741a
Merge 0.9->trunk

diff -r 0880a079d830 -r 421c7830eccc prosodyctl