# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1366380969 -7200
# Node ID 12a42421bedeeeddc283ea30d90029bcb7732790
# Parent  063d1f706ba718000938d14a9f133cb8d770b8ea# Parent  eeea0eb2602a9b885cea3bba2f57a585f72e1447
Merge 0.9->trunk

diff -r eeea0eb2602a -r 12a42421bede prosodyctl