# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1363091435 0
# Node ID b8fbb9d07efcd9dcad127909ce00cb82c57c6423
# Parent  4c8c8285bf88eef5b98cf008ad379767d03ddc30# Parent  9b85976c873fa977da44f747e1facfa0d5845e13
Merge 0.9->trunk

diff -r 9b85976c873f -r b8fbb9d07efc prosodyctl