# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1363962166 0
# Node ID 61cf6b84ae81e19370de434a40418376ea0e7e6d
# Parent  97197ca60cb285a9836c216ade54f9cb15889aab# Parent  f29c26da7ecc04859ff841421bf7912c1fcdb7e6
Merge 0.9->trunk

diff -r f29c26da7ecc -r 61cf6b84ae81 prosodyctl