# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1355265662 -3600
# Node ID cf4954f1c35ab1bb4c912b5bfb1607e9bbffe62e
# Parent  4f9135e6c2f965335367ca75cb75f8c323c6bd55# Parent  0cc0359d8c39c116f5476aaeaef1767ae36ebddf
Merge 0.9->trunk

diff -r 0cc0359d8c39 -r cf4954f1c35a prosodyctl