# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1353631913 -3600
# Node ID e6fedce399eb09621982568947f2e00e034a655f
# Parent  a63c4ad6cb36b714c52889dc4e20902302257cd8# Parent  430797a8fc81bef44f158a69d39783116a8c242c
Merge 0.9->trunk

diff -r 430797a8fc81 -r e6fedce399eb prosodyctl