# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1364732479 -3600
# Node ID dd91b72a3ba0eeb8b079622aa6914e76adc6eaef
# Parent  4a3737f0ce9afd460e6451e0d0226eefd8a54d4c# Parent  13454b2b86bfa92d24794da6e08ea4e8ab870172
Merge 0.9->trunk

diff -r 13454b2b86bf -r dd91b72a3ba0 prosodyctl