# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1366375448 -7200
# Node ID 063d1f706ba718000938d14a9f133cb8d770b8ea
# Parent  b42781a961745f0893edaf8ba90feb02e78e2acd# Parent  2a67235e1d4d5dfbe969fee9dadcb95a55ed1e2a
Merge 0.9->trunk

diff -r 2a67235e1d4d -r 063d1f706ba7 prosodyctl