# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1368520772 -3600
# Node ID b8101bc0630f49e3341865d91f4f11e91d148504
# Parent  345593806e223dcde49056423434cc0caa949fc2# Parent  8b09b0d068d42bff1d88e373b7afea26b4c9d3dd
Merge 0.9->trunk

diff -r 8b09b0d068d4 -r b8101bc0630f prosodyctl