# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1365431571 -3600
# Node ID 51686426cac20455af62e1fba847907f8ab39b19
# Parent  30ab4e69a50d5547267a531a2f51fc4d77346131# Parent  9054b51e71a4f442107096906be76195ae6bb4b3
Merge 0.9->trunk

diff -r 9054b51e71a4 -r 51686426cac2 prosodyctl