# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1356699055 0
# Node ID 03dc0ae2749934bb28ba495def86a413d7e908d2
# Parent  746f07d280e2450baa87ff3b91783f0414a0f7af# Parent  0d08c09658243280dd8487298d9bd7d9d8e107ed
Merge 0.9->trunk

diff -r 0d08c0965824 -r 03dc0ae27499 prosodyctl