# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1367064687 -3600
# Node ID 8e41b127e44ef268876dcc6b5b75cf32630d1da5
# Parent  8741bb69a7862de3eeabc2da7adc703563ab8197# Parent  e9090966c80313589239d652b14c761c801e0ae6
Merge 0.9->trunk

diff -r e9090966c803 -r 8e41b127e44e prosodyctl