# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1365247261 -3600
# Node ID 1994a4483b1c1e2e5597bf0aa25648f0f70544ef
# Parent  7d0622a80087efbc3323eba3501f2dec1b9ba6d7# Parent  a4ba5819bf50ec5e0d30052a9d723b401265b43c
Merge 0.9->trunk

diff -r a4ba5819bf50 -r 1994a4483b1c prosodyctl