# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1367412342 -3600
# Node ID e91db0aac408ac99cdd1e368a3b7e6b83cad328e
# Parent  d3f5165c4113b5df9f6a424228591ac6ed4661a5# Parent  7baf59444b319e5b7298964f6815d2d90d42f7a6
Merge 0.9->trunk

diff -r 7baf59444b31 -r e91db0aac408 prosodyctl