# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1354496820 -18000
# Node ID 115cf8252be82836b017ee9a9f45c37187966f87
# Parent  c2b431042a54d7ad0d4fa911ca65ca85322f099b# Parent  98b71d519fffa8e3897484ba91c0be072a7939d9
Merge 0.9->trunk.

diff -r 98b71d519fff -r 115cf8252be8 prosodyctl