# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1354156704 -18000
# Node ID afa9b7e18e43c07bea9130d6a4ea677579613413
# Parent  b4de85209ccfad63448a922e4576c14dcaf88d73# Parent  c5edb08fc7cb8708b4547e9693448433813d2e85
Merge 0.9->trunk

diff -r c5edb08fc7cb -r afa9b7e18e43 prosodyctl