# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1366057580 -3600
# Node ID de19e6005f1a7ae59c6afbee43f9df69d0400e6f
# Parent  dc9485ac266bae895bcf875a9ddc4dc8dd434550# Parent  50cbea68586f5cc3ef1a32c8d49952cf59d3c503
Merge 0.9->trunk

diff -r 50cbea68586f -r de19e6005f1a prosodyctl