# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1356804822 -3600
# Node ID 19381ed1cc02e361e028d342cbc615137cb2d262
# Parent  a3a4de5104ee86867c225f9ea0cf68634c7089e4# Parent  5d2282a29387dbcc962c5b16de5ceadfd5bdaf52
Merge 0.9->trunk

diff -r 5d2282a29387 -r 19381ed1cc02 prosodyctl