# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1366242085 -3600
# Node ID 307c4b1259b3e1e90a1de3fe87b76783cd397c54
# Parent  421c7830eccc2137c77b8e5d510443007081d924# Parent  5d0cc5de5c51c0d77e6c5e8863fef11b84c6df5e
Merge 0.9->trunk

diff -r 5d0cc5de5c51 -r 307c4b1259b3 prosodyctl