# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1358825438 -18000
# Node ID 19a4a3462574e530cd6b9c37c8538f45f76b3f14
# Parent  19381ed1cc02e361e028d342cbc615137cb2d262# Parent  52fe5df91c6515b363174a00b8331c7bc41dccb0
Merge 0.9->trunk

diff -r 52fe5df91c65 -r 19a4a3462574 prosodyctl