# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1363811678 0
# Node ID 11eff33f60d385a81783d835de8793fc135b6e01
# Parent  b8fbb9d07efcd9dcad127909ce00cb82c57c6423# Parent  18ebc38743648596b67efa445590a2f50ed85fc1
Merge 0.9->trunk

diff -r 18ebc3874364 -r 11eff33f60d3 prosodyctl