# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1351101382 -7200
# Node ID 42765c80244c0192005ec8ac06b64e1029de2d7d
# Parent  3b93f92c613aa19251da0c631c9c55109976bbf2# Parent  b22d24b5a89a0aec62f50d5d9a5534ee347999e0
Merge 0.9 -> trunk

diff -r b22d24b5a89a -r 42765c80244c prosodyctl