# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1362914987 0
# Node ID 4c8c8285bf88eef5b98cf008ad379767d03ddc30
# Parent  33813f000015a25c71bfa2e81fa69490d953dea8# Parent  760c22c822befca84fa4c0963e4e894a5417a289
Merge 0.9->trunk

diff -r 760c22c822be -r 4c8c8285bf88 prosodyctl