# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1366218717 -7200
# Node ID ed10252ee9c393dafde46d59d8e3fbffc3159edf
# Parent  415e520e4a4c1771ef4d00f72a6ad8826f1756ad# Parent  f2631a14b953d07f8b0fe4ca31f8beceb5216872
Merge 0.9->trunk

diff -r f2631a14b953 -r ed10252ee9c3 prosodyctl