# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1365515468 -7200
# Node ID 953888c3107189ed2cea979fd531a0c07fe4f993
# Parent  16493e410fa847fcbb1b1a6a9e9d5e7e37fb4d3a# Parent  87204440b9ddd6a374f862977b90b64fcb4207b0
Merge 0.9->trunk

diff -r 87204440b9dd -r 953888c31071 prosodyctl