# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1355537552 -18000
# Node ID b86172b12912d9f7972111458ba2efff2531097f
# Parent  cf4954f1c35ab1bb4c912b5bfb1607e9bbffe62e# Parent  4516e6bd51b4288f9c369fd1ff04bba0369e5ea3
Merge 0.9->trunk

diff -r 4516e6bd51b4 -r b86172b12912 prosodyctl