# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1354303893 -18000
# Node ID c2b431042a54d7ad0d4fa911ca65ca85322f099b
# Parent  afa9b7e18e43c07bea9130d6a4ea677579613413# Parent  80635a6cb12683a484c9c2370cadfe927f77f9cb
Merge 0.9->trunk.

diff -r 80635a6cb126 -r c2b431042a54 prosodyctl