# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1348934870 -3600
# Node ID 12f5a34380908d7b16998d49dd4b0c2ff696ebda
# Parent  cda4d3f01ddd788e9ea318e71a775c689c932b56# Parent  854f6d9aee2dfb536f2fe670104f21edaab74cd6
Merge 0.9->trunk

diff -r 854f6d9aee2d -r 12f5a3438090 prosodyctl