# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1366057365 -3600
# Node ID dc9485ac266bae895bcf875a9ddc4dc8dd434550
# Parent  3db05041c278319699ad9c6da95e6f7c4cf0738b# Parent  c2c9f07c5d6aff255b9cac6b1cf5e691d2418dd2
Merge 0.9->trunk

diff -r c2c9f07c5d6a -r dc9485ac266b prosodyctl