Diff

prosodyctl @ 4479:d1ddfc4709ce

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 18 Jan 2012 15:08:05 +0000
parent 4476:53ce21286b8c
child 4487:5f466a50e78b
line wrap: on
line diff