Diff

prosodyctl @ 6232:d7dc71d9171d

Merge with Prosody trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 08 May 2014 18:09:59 +0100
parent 6062:6cc6b4d407df
child 6158:08e9c9d0beb3
line wrap: on
line diff