# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1368276914 -3600
# Node ID 40fe8bd35eaa6a4bb788c247e823f726baf54390
# Parent  f592409f5fcd9fa3606c7af1ab45964544e42f06# Parent  ca9f99f7dcbccd3be8ee8140e282ce2634998f59
Merge 0.9->trunk

diff -r ca9f99f7dcbc -r 40fe8bd35eaa prosodyctl