# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1353606134 0
# Node ID e71cf524893cbdd83585d3e873ce92e8da136b19
# Parent  9b93b0698d7e3ccdefa68bb93513cd3a9182de5f# Parent  8461e8ed7c09f169b643c327beb207c596b624fb
Merge 0.9->trunk

diff -r 8461e8ed7c09 -r e71cf524893c prosodyctl