# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1366727918 -3600
# Node ID 865d82f21d122f822799dc7c109efd7c0f355813
# Parent  6ebea1e6795b086d20321a727ae97ddba72a5d29# Parent  1091d7c3b4d2c13cffc426f145240485fc7bbd70
Merge 0.9->trunk

diff -r 1091d7c3b4d2 -r 865d82f21d12 prosodyctl