# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1365163608 -3600
# Node ID 7d0622a80087efbc3323eba3501f2dec1b9ba6d7
# Parent  19d537b5aaccb9c1f317a60fe348e8ab3c40487d# Parent  53b16286509a24c61162a53af715e8ef1f17b142
Merge 0.9->trunk

diff -r 53b16286509a -r 7d0622a80087 prosodyctl