# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1365438135 -3600
# Node ID 116971a751d3ade3a977c74815cc94fc7f560e60
# Parent  51686426cac20455af62e1fba847907f8ab39b19# Parent  edf3db386a19f1ab6dd5b1da98ff4728a894e5d3
Merge 0.9->trunk

diff -r edf3db386a19 -r 116971a751d3 prosodyctl