# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1366726487 -3600
# Node ID 764bda4b28b8cbdf1e7df068191065d610086946
# Parent  b42781a961745f0893edaf8ba90feb02e78e2acd# Parent  3758898cefdd9447a19e90fe8d38aabc9c152f2e
Merge 0.9->trunk

diff -r 3758898cefdd -r 764bda4b28b8 prosodyctl