Diff

prosodyctl @ 6072:ce5428f6e3c3

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 15 Apr 2014 18:08:16 +0100
parent 6062:6cc6b4d407df
child 6158:08e9c9d0beb3
line wrap: on
line diff