# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1349118939 -3600
# Node ID 72cdc2d4e15ea9c34a2176431923c9927390e679
# Parent  12f5a34380908d7b16998d49dd4b0c2ff696ebda# Parent  39bb9344f194f81c3f0ecb266362c702709db404
Merge 0.9->trunk

diff -r 39bb9344f194 -r 72cdc2d4e15e prosodyctl