# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1366975553 -3600
# Node ID 8741bb69a7862de3eeabc2da7adc703563ab8197
# Parent  076534a0384ae33d5d0225f28593f9becb0d8472# Parent  3912c9264ef0e3410d7f6fdd699ff62853eae8ac
Merge 0.9->trunk

diff -r 3912c9264ef0 -r 8741bb69a786 prosodyctl