# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1356704051 -3600
# Node ID a3a4de5104ee86867c225f9ea0cf68634c7089e4
# Parent  03dc0ae2749934bb28ba495def86a413d7e908d2# Parent  4cd57cb49f999b776c14fc434cdd11fad4ba37e5
Merge 0.9->trunk

diff -r 4cd57cb49f99 -r a3a4de5104ee prosodyctl