# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1366040588 -3600
# Node ID 3db05041c278319699ad9c6da95e6f7c4cf0738b
# Parent  fcdcc37ffec16a584b83ca5e1199a75afb4928cc# Parent  7c631ef43b1189193e318128847d08b669dfeb07
Merge 0.9->trunk

diff -r 7c631ef43b11 -r 3db05041c278 prosodyctl