# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1364993601 -3600
# Node ID 706053e3f9f514faa37000f72761609f5d93f3cd
# Parent  dd91b72a3ba0eeb8b079622aa6914e76adc6eaef# Parent  e28fca8faf62b89ee39b69438ddc1f803e688be9
Merge 0.9->trunk

diff -r e28fca8faf62 -r 706053e3f9f5 prosodyctl