# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1367228658 -3600
# Node ID abb6c6e3d6dc53c10f017dcf7b40325fc1039673
# Parent  522e99b898a082a7080043b96fcc5595dd0bec2d# Parent  0df0afc041d76781daba0e4493958895c5debcf6
Merge 0.9->trunk

diff -r 0df0afc041d7 -r abb6c6e3d6dc prosodyctl