# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1353687422 -3600
# Node ID 99cb5170a2ea8eaa7ac6f08aa71bfdaf5187bb15
# Parent  e6fedce399eb09621982568947f2e00e034a655f# Parent  cfc038f1f923490499f9b871bca37f04c99481b3
Merge 0.9->trunk

diff -r cfc038f1f923 -r 99cb5170a2ea prosodyctl