# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1359903147 -3600
# Node ID 33813f000015a25c71bfa2e81fa69490d953dea8
# Parent  19a4a3462574e530cd6b9c37c8538f45f76b3f14# Parent  518d864b2ab8e4e1cd53a491f7e611fb2f419582
Merge 0.9->trunk

diff -r 518d864b2ab8 -r 33813f000015 prosodyctl