# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1365429916 -3600
# Node ID 30ab4e69a50d5547267a531a2f51fc4d77346131
# Parent  e66973c81e89dcdbc3546b5f2dc9f9041571ccc6# Parent  92615cfa227064d99f9008d03c2d7dad9ad9f75b
Merge 0.9->trunk

diff -r 92615cfa2270 -r 30ab4e69a50d prosodyctl