# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1354511074 -18000
# Node ID ba51d0917c64f710dd27aa4a48ca7904589b58e2
# Parent  115cf8252be82836b017ee9a9f45c37187966f87# Parent  76e4651142e19b66737db63a85c56a9e004736f2
Merge 0.9->trunk.

diff -r 76e4651142e1 -r ba51d0917c64 prosodyctl