# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1364478663 14400
# Node ID 4a3737f0ce9afd460e6451e0d0226eefd8a54d4c
# Parent  9adde79c52b9d374700689e73ccf678090606ecc# Parent  ed55a48270be38c5935afb6da1577633935951fd
Merge 0.9->trunk

diff -r ed55a48270be -r 4a3737f0ce9a prosodyctl