# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1354155405 -18000
# Node ID f7ff48494c2bdc470cb6b1da7a8aec476eee461e
# Parent  a63c4ad6cb36b714c52889dc4e20902302257cd8# Parent  0b4f680ea11644476b4552f03b3f0a3aec20fb3d
Merge 0.9->trunk

diff -r 0b4f680ea116 -r f7ff48494c2b prosodyctl