# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1356660236 -3600
# Node ID 746f07d280e2450baa87ff3b91783f0414a0f7af
# Parent  f716a3c58b4b04591a7dfb8fea3705b4630fac8d# Parent  1e555909f23df375cf210566f6a868a4e0153bca
Merge 0.9->trunk

diff -r 1e555909f23d -r 746f07d280e2 prosodyctl