Diff

prosodyctl @ 4290:aaa06e68a9e4

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 02 Jun 2011 15:28:41 +0100
parent 4167:9c60cc8dc142
child 4324:5e7cba840409
line wrap: on
line diff