# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1364473035 0
# Node ID 3d1de30fefec000d92bea4af5d75aec4792ee283
# Parent  214c32e10734da72016d6a325e4514706da1b573# Parent  57c4964eff0bd0d761888d04c282d2516de5d934
Merge 0.9->trunk

diff -r 57c4964eff0b -r 3d1de30fefec prosodyctl