# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1364477489 14400
# Node ID 9adde79c52b9d374700689e73ccf678090606ecc
# Parent  3d1de30fefec000d92bea4af5d75aec4792ee283# Parent  ec33d72a08b6e88b683525f22efba7b400de765b
Merge 0.9->trunk

diff -r ec33d72a08b6 -r 9adde79c52b9 prosodyctl