Diff

prosodyctl @ 6820:40d50c239564

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 03 Sep 2015 16:43:46 +0100
parent 6784:4da860edc27c
child 6837:13b44929ae49
line wrap: on
line diff