# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1368217880 -7200
# Node ID 19e1f9881bfcbfe36aeb3346dd875310e649a8d0
# Parent  f592409f5fcd9fa3606c7af1ab45964544e42f06# Parent  ae9672f4079aa169a88934488e356ce6d76f3e31
Merge 0.9->trunk

diff -r ae9672f4079a -r 19e1f9881bfc prosodyctl