# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1366918671 -3600
# Node ID 076534a0384ae33d5d0225f28593f9becb0d8472
# Parent  865d82f21d122f822799dc7c109efd7c0f355813# Parent  75230be5be58dda6c0531100d770acb0289c79b3
Merge 0.9->trunk

diff -r 75230be5be58 -r 076534a0384a prosodyctl