Diff

prosodyctl @ 5559:1ac0a9a6b02b

Merge s2s branch
author Matthew Wild <mwild1@gmail.com>
date Wed, 01 May 2013 13:57:00 +0100
parent 5554:e91db0aac408
child 5584:1d841117117c
line wrap: on
line diff