# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1355546143 -3600
# Node ID eba55873ef2967c0c491789b920a51695cc3dbf4
# Parent  b86172b12912d9f7972111458ba2efff2531097f# Parent  f29741c960909a498d32d4a9c1e8704ffe4aed3b
Merge 0.9->trunk

diff -r f29741c96090 -r eba55873ef29 prosodyctl