# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1367192164 -3600
# Node ID 522e99b898a082a7080043b96fcc5595dd0bec2d
# Parent  2539e60cc070b6a63c8ce79a705743ee93d0a573# Parent  df3c78221f265e0feeed08d32fb63511a9506acc
Merge 0.9->trunk

diff -r df3c78221f26 -r 522e99b898a0 prosodyctl