Diff

prosodyctl @ 6666:42fdc8dddf04

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 06 May 2015 19:26:53 +0100
parent 6637:ecc039288edc
child 6711:76683a3f3d75
line wrap: on
line diff