# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1367231237 -3600
# Node ID d3f5165c4113b5df9f6a424228591ac6ed4661a5
# Parent  34ec169206857aae7175b192af9b431d80c83263# Parent  329ebdfb39a2360394f5ce89afa072b07b802fee
Merge 0.9->trunk

diff -r 329ebdfb39a2 -r d3f5165c4113 prosodyctl