# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1367229265 -3600
# Node ID 34ec169206857aae7175b192af9b431d80c83263
# Parent  abb6c6e3d6dc53c10f017dcf7b40325fc1039673# Parent  0ae7ed378405a90b4017e69d07986dccb7fb5002
Merge 0.9->trunk

diff -r 0ae7ed378405 -r 34ec16920685 prosodyctl