# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1353613332 -3600
# Node ID 9ab06d0dbf6853650c99d97cd6da7f6352992bf2
# Parent  7f6cc8ed22477f641f6d6cdbe12e777d45602b99# Parent  76c73bd3d48381fdce6abb6a9cb0c39f5c11fff9
Merge 0.9->trunk

diff -r 76c73bd3d483 -r 9ab06d0dbf68 prosodyctl