# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1353613122 0
# Node ID 7f6cc8ed22477f641f6d6cdbe12e777d45602b99
# Parent  e71cf524893cbdd83585d3e873ce92e8da136b19# Parent  6689605f85913dd41118493fea55a485f418daff
Merge 0.9->trunk

diff -r 6689605f8591 -r 7f6cc8ed2247 prosodyctl