# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1368179187 -3600
# Node ID c463558bed45aef9facab0e61f941026232b4b37
# Parent  cdb057244e44874d21da73cce749e159cd588117# Parent  c4ab25b35a551df9262eb01f36bf4b493527e2a1
Merge 0.9->trunk

diff -r c4ab25b35a55 -r c463558bed45 prosodyctl