# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1363965403 0
# Node ID a344c1120e2bc5859846a84e3df0a8698fbfa9d9
# Parent  61cf6b84ae81e19370de434a40418376ea0e7e6d# Parent  ab31dbb3a41591cf819e88830e73ba56ce5b6c8d
Merge 0.9->trunk

diff -r ab31dbb3a415 -r a344c1120e2b prosodyctl